The branch, master has been updated via 65d460e62294a2ee9b27dfd6f2b8abd518596833 (commit) from 61ef5f76438f263442d41ba3e8cff8725b4dfcca (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 65d460e62294a2ee9b27dfd6f2b8abd518596833 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 2 22:20:30 2012 +0200 Mount proc and sysfs from outside chroot, cleanly unmount both in case there are more than one mountpoints for sysfs or proc mounted. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- .../sbin/x2gothinclient_create | 5 ++--- x2gothinclientmanagement/sbin/x2gothinclient_shell | 9 ++++++--- .../sbin/x2gothinclient_upgrade | 5 ++--- 4 files changed, 12 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0988afa..4bf2668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low got relocated to /run). - /etc/network/interfaces in wheezy already contains a loopback device entry. - - Cleanly unmount --bind mounts in case there are more than one. + - Mount proc and sysfs from outside chroot, cleanly unmount both in case + there are more than one mountpoints for sysfs or proc mounted. - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. - Disable kms for radeon and i915 graphics adapters. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 22ade73..378672b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -192,9 +192,8 @@ EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot $TC_CHROOT /x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 974d966..ae6b55e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -80,8 +80,12 @@ fi export X2GO_HANDLE_DAEMONS=false +mount /root + /bin/$TC_SHELL +umount /root + echo echo "X2go Thin Client Shell has exited." echo @@ -89,9 +93,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_shell.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 218b4b9..2050c9e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -92,9 +92,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount --bind /proc $TC_CHROOT/proc -mount --bind /dev $TC_CHROOT/dev -mount --bind /sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc +mount -tsysfs sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_upgrade.sh 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).