[X2go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-1-gb965416

[X2Go dev team]

The branch, master has been updated
       via  b9654161728ea578208df1a2f917b6c5fcb7073b (commit)
      from  111c8e9da59660fb68473111fb0a32c7106a1170 (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 b9654161728ea578208df1a2f917b6c5fcb7073b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 10 14:14:44 2012 +0200

    When X2Go TCE has plymouth installed, make sure pressing the halt button does not change to the wrong tty.

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

Summary of changes:
 debian/changelog                    |    8 ++++++++
 x2gothinclient/sbin/x2gothinclientd |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a8f76d0..906da89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x2gothinclient (1.0.1.8-0~x2go2) UNRELEASED; urgency=low
+
+  * New upstream version (1.0.1.8):
+    - When X2Go TCE has plymouth installed, make sure pressing the
+      halt button does not change to the wrong tty.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 10 Aug 2012 14:13:49 +0200
+
 x2gothinclient (1.0.1.8-0~x2go1) unstable; urgency=low
 
   * New upstream version (1.0.1.8):
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index d3be9a7..61bd512 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -95,6 +95,8 @@ elsif ($pid == 0 )
 		# test if shutdown button on X2Go Client was clicked
 		if ( -e "/home/x2goclient/.halt")
 		{
+			# when used with plymouth, make sure we stay on the correct terminal
+			system("killall Xorg");
 			system("shutdown -h now");
 		}
 		# test if XServer is running, if not launch it...


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).