[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-12-g50ac97e

[X2Go dev team]

The branch, build-main has been updated
       via  50ac97e71bbbfef035df648e3fef4e5ddc0369cd (commit)
      from  3328fca6529c9c43ca19083ab8d090cd84f36de3 (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                                   |    3 +++
 .../sbin/x2gothinclient_create                     |   17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 117c050..a7c5f03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - Step towards wheezy, enable plymouth boot splash.
     - Symlink /etc/mtab to /proc/mounts before installing any kernel
       during the chroot creation process.
+    - Handle /etc/fstab in TCE chroot differently for squeeze and wheezy
+      (/dev/pts does not need an entry in fstab on wheezy systems, /var/run
+      got relocated to /run).
 
  -- 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 c263cdf..0126f56 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -82,15 +82,14 @@ echo "auto lo" >>   $TC_CHROOT/etc/network/interfaces
 echo "iface lo inet loopback" >>   $TC_CHROOT/etc/network/interfaces
 echo "x2gothinclient" > $TC_CHROOT/etc/hostname
 echo "127.0.0.1 localhost" >> $TC_CHROOT/etc/hosts
+
 cat > $TC_CHROOT/etc/fstab <<EOF
-#proc	/proc			proc	defaults		0	0
+proc	/proc			proc	defaults		0	0
 none	/dev/pts		devpts	gid=5,mode=620		0	0
 none	/tmp			tmpfs	size=50M,mode=1777	0	0
 none	/root			tmpfs	size=100M,mode=700	0	0
 none	/etc/udev/rules.d	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
 none	/home			tmpfs	size=50M		0	0
 none	/media			tmpfs	size=50M		0	0
 none	/var/lib/nfs		tmpfs	size=50M		0	0
@@ -99,6 +98,18 @@ none	/var/lib/dbus		tmpfs	size=50M		0	0
 none	/var/lib/alsa		tmpfs	size=50M		0	0
 EOF
 
+# differences between Debian versions
+if [ "$TC_DISTRO_CODENAME" = "squeeze" ]; then
+  cat >> $TC_CHROOT/etc/fstab <<EOF
+none	/var/run		tmpfs	size=50M		0	0
+none	/var/lock		tmpfs	size=50M		0	0
+EOF
+elif [ "$TC_DISTRO_CODENAME" = "wheezy" ]; then
+  cat >> $TC_CHROOT/etc/fstab <<EOF
+none	/run			tmpfs	size=50M		0	0
+none	/run/lock		tmpfs	size=50M		0	0
+EOF
+fi
 
 cat > $TC_CHROOT/x2go_tce_install.sh <<EOF
 #!/bin/bash


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