[X2go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-39-g2bdd777
X2Go dev team
git-admin at x2go.org
Thu Sep 13 09:20:27 CEST 2012
The branch, master has been updated
via 2bdd777ef57df2ce3407e05c6dd089f98e3e5cac (commit)
via d695810b0dec1df18a1d12657b3b6bcbd869bdd0 (commit)
via 97b0adae0dd42a1dd1d7d44fb564a875192281c4 (commit)
via 9af63fad8282f9d61b982501178b7b687804170b (commit)
from 9a8654798ec88f499b38644aa373be38a5c3bacf (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 2bdd777ef57df2ce3407e05c6dd089f98e3e5cac
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Sep 13 09:15:06 2012 +0200
Provide a README.hostname file in doc folder of x2gothinclientmanagement.
commit d695810b0dec1df18a1d12657b3b6bcbd869bdd0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Sep 13 09:02:19 2012 +0200
Revert "Remove /etc/hostname, whithout the file, the hostname gets set during PXE boot."
This reverts commit 2e41eb4c545fb1e8c6209c4ed21dfa6ae68d8607.
commit 97b0adae0dd42a1dd1d7d44fb564a875192281c4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Sep 13 08:54:26 2012 +0200
Xorg appears as /usr/bin/X in ps ax output. Make sure it gets detected.
commit 9af63fad8282f9d61b982501178b7b687804170b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Sep 13 08:52:14 2012 +0200
Only mount /proc, /sys, /dev/pts inside chroot if not already mounted.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 ++-
debian/x2gothinclientmanagement.docs | 3 +-
x2gothinclient/sbin/x2gothinclientd | 4 +-
x2gothinclientmanagement/README.hostname | 37 ++++++++++++++++++++
.../sbin/x2gothinclient_create | 1 -
x2gothinclientmanagement/sbin/x2gothinclient_shell | 9 ++---
.../sbin/x2gothinclient_upgrade | 9 ++---
7 files changed, 50 insertions(+), 18 deletions(-)
create mode 100644 x2gothinclientmanagement/README.hostname
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 75c56b4..59c4f2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,6 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
we only find a 686-pae kernel which fails on some (virtual) hardware (e.g.
virtualbox).
- 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.
@@ -38,6 +36,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
- Move configuration template from /usr/share/tce to /usr/share/tce/etc.
- Add direct FreeRDP support for defaults TCE installation.
- Start with US keyboard as default keyboard layout.
+ - Only mount /proc, /sys, /dev/pts inside chroot if not already mounted.
+ - Xorg appears as /usr/bin/X in ps ax output. Make sure it gets detected.
+ - Provide a README.hostname file in doc folder of x2gothinclientmanagement.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200
diff --git a/debian/x2gothinclientmanagement.docs b/debian/x2gothinclientmanagement.docs
index 76b6c95..362fedf 100644
--- a/debian/x2gothinclientmanagement.docs
+++ b/debian/x2gothinclientmanagement.docs
@@ -1 +1,2 @@
-x2gothinclientmanagement/README
\ No newline at end of file
+x2gothinclientmanagement/README
+x2gothinclientmanagement/README.hostname
\ No newline at end of file
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index 61bd512..f822454 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -33,8 +33,8 @@ sub catch_term
sub check_x
{
- my $x=`ps ax | grep Xorg`;
- if ( $x=~m/usr.bin.Xorg/ )
+ my $x=`ps ax | grep X`;
+ if ( $x=~m/usr.bin.(Xorg|X)/ )
{
return 1;
}
diff --git a/x2gothinclientmanagement/README.hostname b/x2gothinclientmanagement/README.hostname
new file mode 100644
index 0000000..c76568a
--- /dev/null
+++ b/x2gothinclientmanagement/README.hostname
@@ -0,0 +1,37 @@
+Accept X2GO thin client hostname from DHCP/DNS server
+------------------------------------------------------
+
+Inside the TCE chroot you find an /etc/hostname file.
+
+With some DHCP/DNS setups the hostname gets set during
+PXE boot and if /etc/hostname is missing, the hostname
+will be kept as is.
+
+If you want to use that feature:
+
+ $ x2gothinclient_shell
+ (chroot)$ rm -f /etc/hostname
+ (chroot)$ exit
+
+
+Generic Linux networks (isc-dhcp-server, bind):
+-----------------------------------------------
+ToDo. Anyone can give good information on how to setup
+the DHCP/DNS services to make that work?
+
+
+Debian Edu
+----------
+In Debian Edu networks you can remove /etc/hostname inside th
+chroot and then the hostname gets set during PXE boot.
+
+
+Windows DHCP server
+-------------------
+By default, the Windows DHCP server does not provide a hostname
+via PXE boot. So, in this case you should keep /etc/hostname.
+
+
+light+love,
+Mike Gabriel, 20120913
+
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index b8f0c7e..7414f3a 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -164,7 +164,6 @@ export X2GO_HANDLE_DAEMONS=false
[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot at boot@') && ln -s \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp
[ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y
-[ \$? -eq 0 ] && rm -f /etc/hostname
# blacklist kernel modules
[ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index cb9fab6..aef3ed7 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -78,9 +78,6 @@ if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then
chmod a+x /sbin/start-stop-daemon
fi
-# make sure the /etc/hostname file is not presented in the chroot
-[ -e /etc/hostname ] && rm -f /etc/hostname
-
export X2GO_HANDLE_DAEMONS=false
mount /root
@@ -96,9 +93,9 @@ EOF
chmod u+x "$TC_CHROOT/x2go_tce_shell.sh"
mkdir -p $TC_CHROOT/{proc,dev/pts,sys}
-mount -tproc proc $TC_CHROOT/proc || true
-mount -tsysfs sys $TC_CHROOT/sys || true
-mount -tdevpts devts $TC_CHROOT/dev/pts || true
+mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true
+mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true
+mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || true
chroot "$TC_CHROOT" /x2go_tce_shell.sh
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index acd9a5b..1cdca46 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
@@ -68,9 +68,6 @@ if [ \$(stat --format '%s' /sbin/start-stop-daemon) -gt 200 ]; then
chmod a+x /sbin/start-stop-daemon
fi
-# make sure the /etc/hostname file is not presented in the chroot
-[ -e /etc/hostname ] && rm -f /etc/hostname
-
export X2GO_HANDLE_DAEMONS=false
[ \$? -eq 0 ] && apt-get update
@@ -95,9 +92,9 @@ EOF
chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh"
mkdir -p $TC_CHROOT/{proc,dev/pts,sys}
-mount -tproc proc $TC_CHROOT/proc || true
-mount -tsysfs sys $TC_CHROOT/sys || true
-mount -tdevpts devpts $TC_CHROOT/dev/pts || true
+mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true
+mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true
+mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || 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).
More information about the x2go-commits
mailing list