[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-16-ge2759c3

X2Go dev team git-admin at x2go.org
Fri Jul 19 23:38:07 CEST 2013


The branch, build-main has been updated
       via  e2759c3216ada716ddfbdc6af6c4cc9a59481d84 (commit)
      from  d6fe083e37c89ef060244c8f959e8b7a68279e6a (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 ++
 .../sbin/x2gothinclient_create                     |   17 ++++++++++-----
 x2gothinclientmanagement/sbin/x2gothinclient_shell |   23 +++++++++++++-------
 .../sbin/x2gothinclient_upgrade                    |   20 ++++++++++++-----
 4 files changed, 43 insertions(+), 19 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9a2bd54..2a2239d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - /etc/network/interfaces in wheezy already contains a loopback device
       entry.
     - Cleanly unmount --bind mounts in case there are more than one.
+    - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade)
+      while thin clients are in use.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 10 Aug 2012 14:13:49 +0200
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index b05b789..be10ab9 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -129,11 +129,19 @@ mkdir -p /etc/network
 ln -sf /dev/shm /etc/network/run 
 
 # disable service restarts
-test -e /sbin/start-stop-daemon.keep || mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep
-echo '#!/bin/sh' > /sbin/start-stop-daemon
-echo 'exit 0' >> /sbin/start-stop-daemon
+test -e /sbin/start-stop-daemon.real || mv /sbin/start-stop-daemon /sbin/start-stop-daemon.real
+echo '#!/bin/sh'                                                             > /sbin/start-stop-daemon
+echo '#'                                                                     >> /sbin/start-stop-daemon
+echo '# X2Go Wrapper to avoid running daemons while performing maintenance.' >> /sbin/start-stop-daemon
+echo '#'                                                                     >> /sbin/start-stop-daemon
+echo                                                                         >> /sbin/start-stop-daemon
+echo 'if [ "\$X2GO_HANDLE_DAEMONS" != "false" ]; then'                        >> /sbin/start-stop-daemon
+echo '        /sbin/start-stop-daemon.real "\$@"'                             >> /sbin/start-stop-daemon
+echo 'fi'                                                                    >> /sbin/start-stop-daemon
 chmod +x /sbin/start-stop-daemon
 
+export X2GO_HANDLE_DAEMONS=false
+
 [ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && echo "$TC_X2GO_DEBURL" > /etc/apt/sources.list.d/x2go.list
 [ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get update
 [ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get install x2go-keyring -y --force-yes
@@ -178,9 +186,6 @@ chmod +x /sbin/start-stop-daemon
 # tweak plymouth
 [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release
 
-# restore start-stop-daemon
-[ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
-
 EOF
 chmod u+x $TC_CHROOT/x2go_tce_install.sh
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index 255dfb7..18e4755 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -66,16 +66,23 @@ echo
 echo 'Note: Service restarts have been disabled in X2Go TCE chroot.'
 echo
 
-# disable service restarts
-test -e /sbin/start-stop-daemon.keep || mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep
-echo '#!/bin/sh' > /sbin/start-stop-daemon
-echo 'exit 0' >> /sbin/start-stop-daemon
-chmod +x /sbin/start-stop-daemon
+# migrate start-stop-daemon to wrapper & variable based start-stop-daemon execution
+if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then
+	cp /sbin/start-stop-daemon /sbin/start-stop-daemon.real
+	echo '#!/bin/sh'                                                             > /sbin/start-stop-daemon
+	echo '#'                                                                     >> /sbin/start-stop-daemon
+	echo '# X2Go Wrapper to avoid running daemons while performing maintenance.' >> /sbin/start-stop-daemon
+	echo '#'                                                                     >> /sbin/start-stop-daemon
+	echo                                                                         >> /sbin/start-stop-daemon
+	echo 'if [ "\$X2GO_HANDLE_DAEMONS" != "false" ]; then'                        >> /sbin/start-stop-daemon
+	echo '        /sbin/start-stop-daemon.real "\$@"'                             >> /sbin/start-stop-daemon
+	echo 'fi'                                                                    >> /sbin/start-stop-daemon
+	chmod a+x /sbin/start-stop-daemon
+fi
 
-/bin/$TC_SHELL
+export X2GO_HANDLE_DAEMONS=false
 
-# restore start-stop-daemon
-[ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
+/bin/$TC_SHELL
 
 echo
 echo "X2go Thin Client Shell has exited."
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index ce289c9..52fd92a 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
@@ -54,11 +54,21 @@ export http_proxy=$TC_HTTP_PROXY
 export https_proxy=$TC_HTTPS_PROXY
 export ftp_proxy=$TC_FTP_PROXY
 
-# disable service restarts
-test -e /sbin/start-stop-daemon.keep || mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep
-echo '#!/bin/sh' > /sbin/start-stop-daemon
-echo 'exit 0' >> /sbin/start-stop-daemon
-chmod +x /sbin/start-stop-daemon
+# migrate start-stop-daemon to wrapper & variable based start-stop-daemon execution
+if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then
+        cp /sbin/start-stop-daemon /sbin/start-stop-daemon.real
+        echo '#!/bin/sh'                                                             > /sbin/start-stop-daemon
+        echo '#'                                                                     >> /sbin/start-stop-daemon
+        echo '# X2Go Wrapper to avoid running daemons while performing maintenance.' >> /sbin/start-stop-daemon
+        echo '#'                                                                     >> /sbin/start-stop-daemon
+        echo                                                                         >> /sbin/start-stop-daemon
+        echo 'if [ "\$X2GO_HANDLE_DAEMONS" != "false" ]; then'                        >> /sbin/start-stop-daemon
+        echo '        /sbin/start-stop-daemon.real "\$@"'                             >> /sbin/start-stop-daemon
+        echo 'fi'                                                                    >> /sbin/start-stop-daemon
+        chmod a+x /sbin/start-stop-daemon
+fi
+
+export X2GO_HANDLE_DAEMONS=false
 
 [ \$? -eq 0 ] && apt-get update
 [ \$? -eq 0 ] && apt-get upgrade


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




More information about the x2go-commits mailing list