[X2go-Commits] x2gothinclient.git - tmpfs (branch) updated: b992334c44aa715b0480baf8f23d9dec28f760e3

[X2go dev team]

The branch, tmpfs has been updated
       via  b992334c44aa715b0480baf8f23d9dec28f760e3 (commit)
      from  414bd8e66fb3351e8eb9740e2e685fac34331a9d (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 b992334c44aa715b0480baf8f23d9dec28f760e3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 16 22:37:25 2011 +0200

    Disabled service restarts in chroot.

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

Summary of changes:
 debian/changelog                                   |    1 +
 x2gothinclientmanagement/sbin/x2gothinclient_shell |    8 ++++++++
 .../sbin/x2gothinclient_upgrade                    |    9 +++++++++
 3 files changed, 18 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 26d9403..4839f3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
   * Add kernel module blacklisting for x2gothinclient_create.
   * Tweak mtab diversion on X2go Thin Client to avoid error messages.
   * Add some more PXE/TFTP info at end of x2gothinclient_pretftpboot script.
+  * Disabled service restarts in chroot.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 May 2011 12:04:34 +0200
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index fe0cd4d..dd383c6 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -63,6 +63,14 @@ echo
 echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the"
 echo 'command line...'
 echo
+echo 'Note: Service restarts have been disabled in X2go TCE chroot."
+echo
+
+# disable service restarts
+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
 
 /bin/$TC_SHELL
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index e345d5d..140df41 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
@@ -54,9 +54,18 @@ export http_proxy=$TC_HTTP_PROXY
 export https_proxy=$TC_HTTPS_PROXY
 export ftp_proxy=$TC_FTP_PROXY
 
+# disable service restarts
+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
+
 [ $? -eq 0 ] && apt-get update
 [ $? -eq 0 ] && apt-get upgrade
 
+# restore start-stop-daemon
+[ `stat --format '%s' /sbin/start-stop-daemon` -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
+
 umount -l /proc &> /dev/null
 umount -l /dev/pts &> /dev/null
 EOF


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