[X2go-Commits] x2gothinclient.git - tmpfs (branch) updated: 96346a02bfd2104583eb8f8dc4cd96202a92e7a5
X2go dev team
git-admin at x2go.org
Thu Jun 16 14:41:49 CEST 2011
The branch, tmpfs has been updated
via 96346a02bfd2104583eb8f8dc4cd96202a92e7a5 (commit)
via c20d91f99176aba593b17b68b1f5a4eb8428a7c6 (commit)
from 322e7b3d13048aea67941e5835705b3343955941 (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 96346a02bfd2104583eb8f8dc4cd96202a92e7a5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jun 16 14:42:30 2011 +0200
Tweak mtab diversion on X2go Thin Client to avoid error messages.
commit c20d91f99176aba593b17b68b1f5a4eb8428a7c6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jun 16 14:39:11 2011 +0200
whitespace fix
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2gothinclientmanagement/bin/x2gothinclient_create | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 884bbf1..7384304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
* Add comment that names possible boot profiles to tftp config template.
* Add midnight commander to Recommends: of x2gothinclient.
* Add kernel module blacklisting for x2gothinclient_create.
+ * Tweak mtab diversion on X2go Thin Client to avoid error messages.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_create b/x2gothinclientmanagement/bin/x2gothinclient_create
index aa318b3..af8d901 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_create
+++ b/x2gothinclientmanagement/bin/x2gothinclient_create
@@ -80,6 +80,7 @@ none /tmp tmpfs size=50M,mode=1777 0 0
none /root tmpfs size=100M,mode=700 0 0
none /etc/network/run tmpfs size=50M 0 0
none /etc/udev/rules.d tmpfs size=50M 0 0
+none /etc/mtab.tmp tmpfs size=50M 0 0
none /var/run tmpfs size=50M 0 0
none /var/log tmpfs size=50M 0 0
none /var/lock tmpfs size=50M 0 0
@@ -123,7 +124,7 @@ mkdir -p /var/lib/nfs
[ $? -eq 0 ] && echo && echo "# modules blacklisted on X2go Thin Clients..." >> /etc/modprobe.d/blacklist.conf
[ $? -eq 0 ] && for mod in $TC_MODULE_BLACKLIST; do echo "blacklist $mod" >> /etc/modprobe.d/blacklist.conf
-#Pulsaudio must come afterwards until the thinclient-package is fixed
+# Pulsaudio must come afterwards until the thinclient-package is fixed
[ $? -eq 0 ] && apt-get install pulseaudio -y
[ $? -eq 0 ] && dpkg-reconfigure locales
[ $? -eq 0 ] && apt-get install patch -y
@@ -147,6 +148,10 @@ PATCH
[ $? -eq 0 ] && update-initramfs -u -v
[ $? -eq 0 ] && passwd -l root
+# tweak mtab diversion
+[ $? -eq 0 ] && mkdir /etc/mtab.tmp
+[ $? -eq 0 ] && ln -sf /etc/mtab /etc/mtab.tmp/mtab
+
umount -l /proc &>/dev/null
umount -l /dev/pts &>/dev/null
EOF
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