[X2Go-Commits] [x2gothinclient] 01/03: also use lazy unmounts in x2gothinclient_cleanup

git-admin at x2go.org git-admin at x2go.org
Fri Aug 29 22:39:31 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 1c419bc7aac3546de191255400821d67f3be4d21
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 29 22:15:56 2014 +0200

    also use lazy unmounts in x2gothinclient_cleanup
---
 debian/changelog                       |    2 +-
 management/sbin/x2gothinclient_cleanup |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9c736c..ac37cf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
     - Init scripts: Provide status option.
     - Use lazy unmounts for unmounting bind-mounted /proc, /sys, /dev/pts
       after exiting the TCE chroot (x2gothinclient_create, x2gothinclient_shell,
-      x2gothinclient_upgrade).
+      x2gothinclient_upgrade, x2gothinclient_cleanup).
     - Assure that a tmpfs under <chroot>/root gets mounted and cleanly
       unmounted (x2gothinclient_shell, x2gothinclient_upgrade).
     - Use run-parts to initialize the TCE during runtime. (Fixes: #419).
diff --git a/management/sbin/x2gothinclient_cleanup b/management/sbin/x2gothinclient_cleanup
index d1ebd39..ae758a4 100755
--- a/management/sbin/x2gothinclient_cleanup
+++ b/management/sbin/x2gothinclient_cleanup
@@ -55,7 +55,7 @@ read
 # make sure, all chroot-internal mountpoints are gone...
 for mountpoint in proc dev/pts sys; do
 	while true; do
-	cat /proc/mounts | grep "$TC_CHROOT/$mountpoint" >/dev/null && umount "$TC_CHROOT/$mountpoint" || break
+	cat /proc/mounts | grep "$TC_CHROOT/$mountpoint" >/dev/null && umount -l "$TC_CHROOT/$mountpoint" || break
 	done
 done
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git


More information about the x2go-commits mailing list