[X2Go-Commits] [x2gothinclient] 01/01: Assure that a tmpfs under <chroot>/root gets mounted and cleanly unmounted (x2gothinclient_shell, x2gothinclient_upgrade).

git-admin at x2go.org git-admin at x2go.org
Fri Aug 29 11:28:50 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 c65a1087a6b0b4bd788b9a8519e09d51160c733b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 29 11:28:42 2014 +0200

    Assure that a tmpfs under <chroot>/root gets mounted and cleanly unmounted (x2gothinclient_shell, x2gothinclient_upgrade).
---
 debian/changelog                       |    2 ++
 management/sbin/x2gothinclient_shell   |    2 +-
 management/sbin/x2gothinclient_upgrade |    4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6003418..9d00b2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
     - Use lazy unmounts for unmounting bind-mounted /proc, /sys, /dev/pts
       after exiting the TCE chroot (x2gothinclient_shell,
       x2gothinclient_upgrade).
+    - Assure that a tmpfs under <chroot>/root gets mounted and cleanly
+      unmounted (x2gothinclient_shell, x2gothinclient_upgrade).
     - New TCE component: x2gothinclient-minidesktop. Instead of using
       X2Go Client as login manager, we launch a minimal MATE desktop and
       connect to X2Go sessions from there.
diff --git a/management/sbin/x2gothinclient_shell b/management/sbin/x2gothinclient_shell
index 2159a9a..45e5859 100755
--- a/management/sbin/x2gothinclient_shell
+++ b/management/sbin/x2gothinclient_shell
@@ -85,7 +85,7 @@ mount /root
 
 ${*:-/bin/$TC_SHELL}
 
-umount /root
+cd / && umount -l /root
 
 echo
 echo "X2Go Thin Client Shell has exited."
diff --git a/management/sbin/x2gothinclient_upgrade b/management/sbin/x2gothinclient_upgrade
index 03fcd4d..286464e 100755
--- a/management/sbin/x2gothinclient_upgrade
+++ b/management/sbin/x2gothinclient_upgrade
@@ -71,6 +71,8 @@ fi
 export X2GO_HANDLE_DAEMONS=false
 export LANG=C
 
+mount /root
+
 [ \$? -eq 0 ] && apt-get update
 [ \$? -eq 0 ] && apt-get upgrade
 [ \$? -eq 0 ] && apt-get clean
@@ -87,6 +89,8 @@ done
 # restore start-stop-daemon
 [ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
 
+cd / && umount -l /root
+
 echo
 echo "X2go Thin Client Shell upgrade has finished."
 echo

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


More information about the x2go-commits mailing list