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

[X2Go dev team]

The branch, build-main has been updated
       via  2e41eb4c545fb1e8c6209c4ed21dfa6ae68d8607 (commit)
      from  3e2b724b3c476b645b88bb6b0c59a26486b73136 (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                     |    1 +
 x2gothinclientmanagement/sbin/x2gothinclient_shell |    3 +++
 .../sbin/x2gothinclient_upgrade                    |    3 +++
 4 files changed, 9 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index edc2342..9500ff0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ 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.
 
  -- 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 8e14e6b..5941e21 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -161,6 +161,7 @@ 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 89cbbcf..7b2d347 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -78,6 +78,9 @@ 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
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index f0c0307..9268cda 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
@@ -68,6 +68,9 @@ 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


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