[X2go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-29-g60d6d46

X2Go dev team git-admin at x2go.org
Mon Sep 3 22:30:32 CEST 2012


The branch, master has been updated
       via  60d6d46001c3910b2279da48ddc6cc224cd4a60a (commit)
       via  77b5ffcb41a8b6d481af2ab8676986ee63091b2a (commit)
       via  7d0ae5ee46b503a3fb7a1ac1053376b92a1fe77d (commit)
      from  e495654fd55021e8818cbc2f7710bf8ab6d9d013 (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 60d6d46001c3910b2279da48ddc6cc224cd4a60a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 3 22:30:28 2012 +0200

    whitespace fix

commit 77b5ffcb41a8b6d481af2ab8676986ee63091b2a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 3 22:23:52 2012 +0200

    Make the SSH daemon listen on IPv4 localhost address only.

commit 7d0ae5ee46b503a3fb7a1ac1053376b92a1fe77d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 3 22:13:01 2012 +0200

    Keep mounts for /proc and /dev/pts with option noauto for mounting inside of chroot. They are not needed during TCE boot.

-----------------------------------------------------------------------

Summary of changes:
 README.howto                                       |    3 ++-
 debian/changelog                                   |    3 +++
 .../sbin/x2gothinclient_create                     |    6 ++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/README.howto b/README.howto
index ed9eac0..11d4e8d 100644
--- a/README.howto
+++ b/README.howto
@@ -5,4 +5,5 @@ A detailled installation description is available in the X2Go Wiki:
 http://wiki.x2go.org/doku.php/wiki:components:tce
 
 light+love,
-Mike Gabriel
\ No newline at end of file
+Mike Gabriel
+
diff --git a/debian/changelog b/debian/changelog
index 9500ff0..0004817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - Make sure that kernel + initrd symlinks are relative symlinks.
     - Remove /etc/hostname, whithout the file, the hostname gets set during PXE
       boot.
+    - Keep mounts for /proc and /dev/pts with option noauto for mounting inside
+      of chroot. They are not needed during TCE boot.
+    - Make the SSH daemon listen on IPv4 localhost address only.
 
  -- 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 b546b4a..bd94944 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -86,7 +86,8 @@ 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,noauto		0	0
+none	/dev/pts		devpts	gid=5,mode=620,noauto	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
@@ -104,7 +105,6 @@ 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
-none	/dev/pts		devpts	gid=5,mode=620		0	0
 EOF
 elif [ "$TC_DISTRO_CODENAME" = "wheezy" ]; then
   cat >> $TC_CHROOT/etc/fstab <<EOF
@@ -184,6 +184,8 @@ export X2GO_HANDLE_DAEMONS=false
 [ \$? -eq 0 ] && update-initramfs -u -v
 [ \$? -eq 0 ] && passwd -l root
 
+[ \$? -eq 0 ] && sed -e 's/#ListenAddress ::/AddressFamily inet\nListenAddress 127.0.0.1/' -i /etc/ssh/sshd_config
+
 # 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
 [ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf


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