The branch, build-main has been updated via 9af63fad8282f9d61b982501178b7b687804170b (commit) from 9a8654798ec88f499b38644aa373be38a5c3bacf (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 + x2gothinclientmanagement/sbin/x2gothinclient_shell | 6 +++--- .../sbin/x2gothinclient_upgrade | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 75c56b4..08e9201 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Move configuration template from /usr/share/tce to /usr/share/tce/etc. - Add direct FreeRDP support for defaults TCE installation. - Start with US keyboard as default keyboard layout. + - Only mount /proc, /sys, /dev/pts inside chroot if not already mounted. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index cb9fab6..0755bab 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -96,9 +96,9 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" mkdir -p $TC_CHROOT/{proc,dev/pts,sys} -mount -tproc proc $TC_CHROOT/proc || true -mount -tsysfs sys $TC_CHROOT/sys || true -mount -tdevpts devts $TC_CHROOT/dev/pts || true +mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true +mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true +mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || true chroot "$TC_CHROOT" /x2go_tce_shell.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index acd9a5b..02aa459 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -95,9 +95,9 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" 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 +mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true +mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true +mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || true chroot "$TC_CHROOT" /x2go_tce_upgrade.sh 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).