[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-110-g1df5f43

[X2Go dev team]

The branch, master has been updated
       via  1df5f432f223a8816d22a8ee491eaffed020f870 (commit)
      from  6cbe83c867d60bae52823c9a784c515064337a6e (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 1df5f432f223a8816d22a8ee491eaffed020f870
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 21 13:38:37 2013 +0200

    Fix code that turns absolute symlinks into relative symlink for /vmlinuz and /initrd.img.

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

Summary of changes:
 debian/changelog                                   |    2 ++
 .../sbin/x2gothinclient_create                     |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9c65d6d..f3c0639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - Unmount /proc, /sys and /dev/pts before doing x2gothinclient_cleanup.
     - Add README.qemu that explains how to test the X2Go TCE with qemu.
       (Fixes: #115).
+    - Fix code that turns absolute symlinks into relative symlink for /vmlinuz
+      and /initrd.img.
   * /debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Priority: optional.
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index b19a9ac..d2fa78d 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -158,9 +158,9 @@ export X2GO_HANDLE_DAEMONS=false
 [ \$? -eq 0 ] && apt-get install syslinux locales -y
 [ \$? -eq 0 ] && dpkg-reconfigure locales
 [ \$? -eq 0 ] && apt-get install linux-image-486 -y
-[ \$? -eq 0 ] && test -e /vmlinuz && mv /vmlinuz /vmlinuz.486.tmp || true
+[ \$? -eq 0 ] && test -h /vmlinuz && mv /vmlinuz /vmlinuz.486.tmp || true
 [ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot at boot@') && ln -sf \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp
-[ \$? -eq 0 ] && test -e /vmlinuz && mv /initrd.img /initrd.img.486.tmp || true
+[ \$? -eq 0 ] && test -h /initrd.img && mv /initrd.img /initrd.img.486.tmp || true
 [ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot at boot@') && ln -sf \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp
 
 [ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y


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