The branch, tmpfs has been updated via b4f74da305a0abd7a6beeedc15502a9bfa6afdf5 (commit) from c1611ea520a29eaf6db280cdcc0117046046fa1f (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 b4f74da305a0abd7a6beeedc15502a9bfa6afdf5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 18 00:47:00 2011 +0200 improval/bugfix of start-stop-daemon disable code ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 2 +- x2gothinclientmanagement/sbin/x2gothinclient_shell | 5 ++++- .../sbin/x2gothinclient_upgrade | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index de553de..838d595 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -113,7 +113,7 @@ mkdir -p /var/lib/nfs mkdir -p /var/lib/dbus # disable service restarts -mv /sbin/start-stop-daemon /sbin/start-stop-daemon.keep +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 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index e6f62aa..91e987e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -68,13 +68,16 @@ 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 +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 /bin/$TC_SHELL +# 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 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 4a8e6f5..35efe3a 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -56,7 +56,7 @@ 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 +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 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).