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

[X2go dev team]

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

    Disable service restarts during x2gothinclient_create.

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

Summary of changes:
 .../sbin/x2gothinclient_create                     |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 3e7f195..269caca 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -105,7 +105,13 @@ export ftp_proxy=$TC_FTP_PROXY
 mkdir -p /tmp/user/0
 mkdir -p /var/lib/xkb
 mkdir -p /var/lib/nfs
-### A Quick workaround for squeeze until the thinclient-package is fixed
+
+# 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 ] && 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
@@ -151,6 +157,9 @@ PATCH
 [ \$? -eq 0 ] && mkdir /etc/mtab.tmp
 [ \$? -eq 0 ] && ln -sf /etc/mtab.tmp/mtab /etc/mtab
 
+# 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).