[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-98-g4b5d38b

X2Go dev team git-admin at x2go.org
Tue Apr 2 11:47:50 CEST 2013


The branch, master has been updated
       via  4b5d38bb785cba6733e0913ea375f5e47078e586 (commit)
      from  fc475f84bcca986b08680175b7a546c9b9e6ded9 (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 4b5d38bb785cba6733e0913ea375f5e47078e586
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 2 11:47:46 2013 +0200

    Unmount /proc, /sys and /dev/pts before doing x2gothinclient_cleanup.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 .../sbin/x2gothinclient_cleanup                    |    7 +++++++
 2 files changed, 8 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fcbc4d3..9a2df76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - When finishing x2gothinclientd, wait when killing processes till all
       processes have vanished. Only kill processes owned by user x2gothinclient.
     - When finishing x2gothinclientd, make sure no dbus-* processes remain.
+    - Unmount /proc, /sys and /dev/pts before doing x2gothinclient_cleanup.
   * /debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Priority: optional.
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
index c17ab19..1e22136 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
@@ -52,6 +52,13 @@ echo
 echo "Alternatively, hit STRG-C to cancel the operation now!!!"
 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
+        done
+done
+
 # CHROOT + TCE config
 test -e "$TC_CHROOT" && {
     echo "Removing $TC_CHROOT..."


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).




More information about the x2go-commits mailing list