The branch, master has been updated via 3d032b2f626d8d7873472c79ab60b2bb028db838 (commit) from 1692e917cc85ab932aed7c2069b6a24972dc0ca6 (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 3d032b2f626d8d7873472c79ab60b2bb028db838 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 2 22:39:29 2012 +0200 Do not fail if proc or sysfs are already mounted within chroot. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 4 ++-- x2gothinclientmanagement/sbin/x2gothinclient_shell | 4 ++-- .../sbin/x2gothinclient_upgrade | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1ed0798..15e5181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low entry. - Mount proc and sysfs from outside chroot, cleanly unmount both in case there are more than one mountpoints for sysfs or proc mounted. + - Do not fail if proc or sysfs are already mounted within chroot. - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade) while thin clients are in use. - Disable kms for radeon and i915 graphics adapters. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 0aa9cb8..d05cbf8 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -189,8 +189,8 @@ EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || true chroot $TC_CHROOT /x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index ae6b55e..89cbbcf 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -93,8 +93,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || true chroot "$TC_CHROOT" /x2go_tce_shell.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 2050c9e..f0c0307 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -92,8 +92,8 @@ EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" mkdir -p $TC_CHROOT/{proc,dev,sys} -mount -tproc proc $TC_CHROOT/proc -mount -tsysfs sys $TC_CHROOT/sys +mount -tproc proc $TC_CHROOT/proc || true +mount -tsysfs sys $TC_CHROOT/sys || 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).