x2gothinclient.git - master (branch) updated: 1.0.1.8-30-g9e756ed - x2go-commits

3 Sep 2012

The branch, master has been updated
       via  9e756ed8695081abd79ff484e0e9dc4fc675b8de (commit)
      from  60d6d46001c3910b2279da48ddc6cc224cd4a60a (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 9e756ed8695081abd79ff484e0e9dc4fc675b8de
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon Sep 3 22:41:52 2012 +0200

    Provide /dev/pts inside chroot.

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

Summary of changes:
 debian/changelog                                   |    1 +
 .../sbin/x2gothinclient_create                     |    5 +++--
 x2gothinclientmanagement/sbin/x2gothinclient_shell |    5 +++--
 .../sbin/x2gothinclient_upgrade                    |    5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 0004817..8b26b4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - Keep mounts for /proc and /dev/pts with option noauto for mounting inside
       of chroot. They are not needed during TCE boot.
     - Make the SSH daemon listen on IPv4 localhost address only.
+    - Provide /dev/pts inside chroot.
 
  -- 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 bd94944..41c335b 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -194,13 +194,14 @@ export X2GO_HANDLE_DAEMONS=false
 EOF
 chmod u+x $TC_CHROOT/x2go_tce_install.sh
 
-mkdir -p $TC_CHROOT/{proc,dev,sys}
+mkdir -p $TC_CHROOT/{proc,dev/pts,sys}
 mount -tproc proc $TC_CHROOT/proc || true
 mount -tsysfs sys $TC_CHROOT/sys || true
+mount -tdevpts devpts $TC_CHROOT/dev/pts || true
 
 chroot $TC_CHROOT /x2go_tce_install.sh
 
-for mountpoint in proc dev sys; do
+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
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index 7b2d347..0ecb1aa 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -95,13 +95,14 @@ echo
 EOF
 chmod u+x "$TC_CHROOT/x2go_tce_shell.sh"
 
-mkdir -p $TC_CHROOT/{proc,dev,sys}
+mkdir -p $TC_CHROOT/{proc,dev/pts,sys}
 mount -tproc proc $TC_CHROOT/proc || true
 mount -tsysfs sys $TC_CHROOT/sys || true
+mount -tdevts devts $TC_CHROOT/dev/pts || true
 
 chroot "$TC_CHROOT" /x2go_tce_shell.sh
 
-for mountpoint in proc dev sys; do
+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
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index 9268cda..acd9a5b 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
@@ -94,13 +94,14 @@ echo
 EOF
 chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh"
 
-mkdir -p $TC_CHROOT/{proc,dev,sys}
+mkdir -p $TC_CHROOT/{proc,dev/pts,sys}
 mount -tproc proc $TC_CHROOT/proc || true
 mount -tsysfs sys $TC_CHROOT/sys || true
+mount -tdevpts devpts $TC_CHROOT/dev/pts || true
 
 chroot "$TC_CHROOT" /x2go_tce_upgrade.sh
 
-for mountpoint in proc dev sys; do
+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


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

    