The branch, tmpfs has been updated via 11ceb91adb40f102f7c14651aa009cb4699c271a (commit) from b4f74da305a0abd7a6beeedc15502a9bfa6afdf5 (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 11ceb91adb40f102f7c14651aa009cb4699c271a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 18 02:56:59 2011 +0200 More variable ($) escaping in x2gothinclient_* scripts. Fixes start-stop-daemon enable/disable code. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../sbin/x2gothinclient_create | 2 +- x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- .../sbin/x2gothinclient_upgrade | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d4f40b7..198e082 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Disabled service restarts in chroot. * Add a ,,hit <RETURN> before TCE creation. * Add tmpfs mount for /var/lib/dbus. + * More variable ($) escaping in x2gothinclient_* scripts. Fixes start-stop-daemon + enable/disable code. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 838d595..5297530 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -163,7 +163,7 @@ PATCH [ \$? -eq 0 ] && ln -sf /proc/mounts /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 +[ \$(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 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 91e987e..19c19c5 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -76,7 +76,7 @@ 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 +[ \$(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 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 35efe3a..6391d0f 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -61,11 +61,11 @@ 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 +[ \$? -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 +[ \$(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 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).