The branch, build-main has been updated via d6fe083e37c89ef060244c8f959e8b7a68279e6a (commit) from 9f416ebe9cf60c6fdd4d3e273b0c60c974e2ac3c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 8 +++++--- x2gothinclientmanagement/sbin/x2gothinclient_shell | 9 +++++---- .../sbin/x2gothinclient_upgrade | 9 +++++---- 4 files changed, 16 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7e21578..9a2bd54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ 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. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index bda5a73..b05b789 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -191,9 +191,11 @@ mount --bind /sys $TC_CHROOT/sys chroot $TC_CHROOT /x2go_tce_install.sh -umount $TC_CHROOT/proc -umount $TC_CHROOT/dev -umount $TC_CHROOT/sys +for mountpoint in proc dev sys; do + while 1; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + done +done rm -f $TC_CHROOT/etc/udev/rules.d/*-persistent-*.rules diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 67a8203..255dfb7 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -90,7 +90,8 @@ mount --bind /sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_shell.sh -umount $TC_CHROOT/proc -umount $TC_CHROOT/dev -umount $TC_CHROOT/sys - +for mountpoint in proc dev sys; do + while 1; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + done +done diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 8f8c61e..ce289c9 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -88,7 +88,8 @@ mount --bind /sys $TC_CHROOT/sys chroot "$TC_CHROOT" /x2go_tce_upgrade.sh -umount $TC_CHROOT/proc -umount $TC_CHROOT/dev -umount $TC_CHROOT/sys - +for mountpoint in proc dev sys; do + while 1; do + cat /proc/mounts | grep $TC_CHROOT/$mountpoint && umount $TC_CHROOT/$mountpoint || break + done +done 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).