[X2go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-24-g3e2b724
X2Go dev team
git-admin at x2go.org
Sun Sep 2 23:06:51 CEST 2012
The branch, master has been updated
via 3e2b724b3c476b645b88bb6b0c59a26486b73136 (commit)
from 3d032b2f626d8d7873472c79ab60b2bb028db838 (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 3e2b724b3c476b645b88bb6b0c59a26486b73136
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Sep 2 22:54:06 2012 +0200
Make sure that kernel + initrd symlinks are relative symlinks.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
.../sbin/x2gothinclient_create | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 15e5181..edc2342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
- Drop i686 kernel support, use i486 kernel by default. In Debian wheezy
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.
-- 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 d05cbf8..8e14e6b 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -155,8 +155,11 @@ 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 ] && mv /vmlinuz /vmlinuz.486
-[ \$? -eq 0 ] && mv /initrd.img /initrd.img.486
+[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486.tmp
+[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot at boot@') && ln -s \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp
+[ \$? -eq 0 ] && mv /initrd.img /initrd.img.486.tmp
+[ \$? -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
# blacklist kernel modules
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