The branch, wheezy-tce has been updated via f51ce717c9443124c5829a64afd0226d8236ae35 (commit) from d485ba449a9668cf4f0a7d004b4c47e61713ac01 (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 f51ce717c9443124c5829a64afd0226d8236ae35 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 1 18:03:36 2013 +0200 Use qx instead of open3 to launch x2goclient. (Fixes: #66). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gothinclient.init | 2 +- x2gothinclient/sbin/x2gothinclientd | 16 ++-------------- 3 files changed, 4 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 61a7d3d..66e4b70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - x2gothinclient_update: make sure config target folders exist. - x2gothinclient_create: syntax fix, spotted by Thomas Güttler (Fixes: #95). - Export $LANG and $LANGUAGE to TCE daemon. + - Use qx instead of open3 to launch x2goclient. (Fixes: #66). * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. + Priority: optional. diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index cbfd047..15c0028 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -78,7 +78,7 @@ case "$1" in stop) if [ -e /var/run/$NAME.pid ]; then log_daemon_msg "Stopping $DESC" "x2gothinclientd" - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid && echo "$NAME." || echo "not running" + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid log_end_msg $? fi ;; diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 088137e..9e86548 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -133,20 +133,8 @@ elsif ($pid == 0 ) } # test if x2goclient is running, if not launch it... - my $x2goclient_pid = 0; - if ( !check_client() ) - { - local *IN, *OUT, *ERR; - $x2goclient_pid = eval { - open3( \*IN, \*OUT, \*ERR, "su - x2gothinclient -c 'DISPLAY=:0 bash -c \"/etc/x2go/x2gothinclient_start &\"'"); - }; - ## give X2Go Client some time to start - sleep(3); - ## wait for x2goclient to finish - if ( check_client() ) - { - waitpid( $x2goclient_pid, 0 ); - } + if ( !check_client() ) { + qx(su - x2gothinclient -c \"export DISPLAY=:0; /etc/x2go/x2gothinclient_start\"); } } } 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).