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

[X2Go dev team]

The branch, build-main has been updated
       via  d695810b0dec1df18a1d12657b3b6bcbd869bdd0 (commit)
      from  97b0adae0dd42a1dd1d7d44fb564a875192281c4 (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 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f1f62e0..4838e6c 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.
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 0755bab..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
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade
index 02aa459..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


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