[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.1.0.0-6-g847f145

[X2Go dev team]

The branch, master has been updated
       via  847f145cfc9d8983b715825ee718a3224c3bddca (commit)
       via  b8774a3a8f2af738b53bb62f26466a931e983217 (commit)
       via  3dd9651fdad6742994b4bab2e9ae29bcf8ff9f43 (commit)
       via  e8581d73ba1c426a85aaf24e17070f3e73b28e7c (commit)
      from  3f13cd0a6466012d297d5772ae79a54355c59691 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 847f145cfc9d8983b715825ee718a3224c3bddca
Merge: 3f13cd0 b8774a3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 11 21:46:02 2013 +0200

    Merge branch 'wheezy-tce'

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |   14 ++++++++++++++
 x2gothinclient/sbin/x2gothinclientd                |    1 +
 x2gothinclientmanagement/sbin/x2gothinclient_shell |    2 +-
 x2gousbmount/x2gousbmount                          |    2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5f97dce..0d09f7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low
+
+  [ Mike Gabriel ]
+  * New upstream version (1.1.0.1):
+    - Switch to VT-7 on TC shutdown.
+    - Syntax fix in x2gousbmount script.
+
+  [ Arnold Krille ]
+  * New upstream version (1.1.0.1):
+    - Extend x2gothinclient_shell to run anything given as arguments and
+      fall back to $TC_SHELL when nothing is given. (Fixes: #301).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 17 Aug 2013 00:35:31 +0200
+
 x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low
 
   [ Mike Gabriel ]
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index 0fac6b4..9f502da 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -101,6 +101,7 @@ elsif ($pid == 0 )
 			# when used with plymouth, make sure we stay on the correct terminal
 			system("killall Xorg");
 			system("shutdown -h now");
+			system("chvt 7");
 		}
 		# test if XServer is running, if not launch it...
 		if ( check_x() ==0 )
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index 42f4f5d..ba4ec21 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -82,7 +82,7 @@ export X2GO_HANDLE_DAEMONS=false
 
 mount /root
 
-/bin/$TC_SHELL
+${*:-/bin/$TC_SHELL}
 
 umount /root
 
diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount
index 0a5123b..7bf7b5a 100755
--- a/x2gousbmount/x2gousbmount
+++ b/x2gousbmount/x2gousbmount
@@ -21,7 +21,7 @@
 use strict;
 use File::Path::Expand;
 
-check_x2gothinclientd() {
+sub check_x2gothinclientd {
 	my $x=`ps ax | grep x2gothinclient`;
 	if ( $x=~m/thinclientd/ )
 	{


hooks/post-receive
-- 
x2gothinclient.git (X2Go Thin Client Environment)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gothinclient.git" (X2Go Thin Client Environment).