[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-11-g3328fca
X2Go dev team
git-admin at x2go.org
Fri Jul 19 23:38:07 CEST 2013
The branch, build-main has been updated
via 3328fca6529c9c43ca19083ab8d090cd84f36de3 (commit)
from 88c3ab78a7b4e3e6205173fc4a4b4b6070d0143e (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 | 2 ++
.../sbin/x2gothinclient_create | 9 +++++----
2 files changed, 7 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4119c32..117c050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
- Fix x2go_tce_shell.sh script, escape braces.
- Change method of mounting /proc, /sys and /dev inside of chroots.
- Step towards wheezy, enable plymouth boot splash.
+ - Symlink /etc/mtab to /proc/mounts before installing any kernel
+ during the chroot creation process.
-- 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 d88ab5a..c263cdf 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -125,6 +125,11 @@ chmod +x /sbin/start-stop-daemon
[ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && echo "$TC_X2GO_DEBURL" > /etc/apt/sources.list.d/x2go.list
[ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get update
[ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get install x2go-keyring -y --force-yes
+
+# tweak mtab diversion
+[ \$? -eq 0 ] && rm -f /etc/mtab
+[ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab
+
[ \$? -eq 0 ] && apt-get update
[ \$? -eq 0 ] && apt-get install $TC_SHELL -y
[ \$? -eq 0 ] && apt-get install syslinux locales -y
@@ -158,10 +163,6 @@ chmod +x /sbin/start-stop-daemon
[ \$? -eq 0 ] && update-initramfs -u -v
[ \$? -eq 0 ] && passwd -l root
-# tweak mtab diversion
-[ \$? -eq 0 ] && rm -f /etc/mtab
-[ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab
-
# tweak plymouth
[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release
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