[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-7-g1451569

X2Go dev team git-admin at x2go.org
Fri Jul 19 23:38:06 CEST 2013


The branch, build-main has been updated
       via  145156970740eaa40ec081ced9a5d047f6f0919d (commit)
      from  12d42ec1454f055391d4039371873a9503705396 (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                     |   14 ++++++++++----
 x2gothinclientmanagement/sbin/x2gothinclient_shell |   16 +++++++++++-----
 .../sbin/x2gothinclient_upgrade                    |   16 +++++++++++-----
 4 files changed, 33 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8942478..714fbc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low
     - Use sed to patch initramfs configuration (rather than a patch
       that fails on wheezy). The change is needed for squeeze only.
     - Fix x2go_tce_shell.sh script, escape braces.
+    - Change method of mounting /proc, /sys and /dev inside of chroots.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 10 Aug 2012 14:13:49 +0200
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index ebe10fc..3d1de34 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -103,8 +103,6 @@ cat > $TC_CHROOT/x2go_tce_install.sh <<EOF
 #!/bin/bash
 
 export LANG=C
-mount /proc
-mount /dev/pts
 export HOME=/root
 export http_proxy=$TC_HTTP_PROXY
 export https_proxy=$TC_HTTPS_PROXY
@@ -166,12 +164,20 @@ chmod +x /sbin/start-stop-daemon
 # restore start-stop-daemon
 [ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
 
-umount -l /proc &>/dev/null
-umount -l /dev/pts &>/dev/null
 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
+
 chroot $TC_CHROOT /x2go_tce_install.sh
 
+umount $TC_CHROOT/proc
+umount $TC_CHROOT/dev
+umount $TC_CHROOT/sys
+
 rm -f $TC_CHROOT/etc/udev/rules.d/*-persistent-*.rules
 
 x2gothinclient_update
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index 1d448bf..67a8203 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -49,8 +49,6 @@ test -e "$TC_CHROOT" || {
 
 cat > "$TC_CHROOT/x2go_tce_shell.sh" <<EOF
 #!/bin/bash
-mount /proc &> /dev/null
-mount /dev/pts &> /dev/null
 export HOME=/root
 
 # export the proxy server (if any) to the shell.
@@ -79,12 +77,20 @@ chmod +x /sbin/start-stop-daemon
 # restore start-stop-daemon
 [ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
 
-umount -l /proc &> /dev/null
-umount -l /dev/pts &> /dev/null
-
 echo
 echo "X2go Thin Client Shell has exited."
 echo
 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
+
 chroot "$TC_CHROOT" /x2go_tce_shell.sh
+
+umount $TC_CHROOT/proc
+umount $TC_CHROOT/dev
+umount $TC_CHROOT/sys
+
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index dbf804e..8f8c61e 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
@@ -48,8 +48,6 @@ test -e "$TC_CHROOT" || {
 
 cat > "$TC_CHROOT/x2go_tce_upgrade.sh" <<EOF
 #!/bin/bash
-mount /proc &> /dev/null
-mount /dev/pts &> /dev/null
 export HOME=/root
 
 export http_proxy=$TC_HTTP_PROXY
@@ -77,12 +75,20 @@ done
 # restore start-stop-daemon
 [ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon
 
-umount -l /proc &> /dev/null
-umount -l /dev/pts &> /dev/null
-
 echo
 echo "X2go Thin Client Shell upgrade has finished."
 echo
 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
+
 chroot "$TC_CHROOT" /x2go_tce_upgrade.sh
+
+umount $TC_CHROOT/proc
+umount $TC_CHROOT/dev
+umount $TC_CHROOT/sys
+


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