[X2Go-Commits] [x2gothinclient] 01/01: FIXME: install x2goclient and lightdm prior to x2gothinclient-minidesktop
git-admin at x2go.org
git-admin at x2go.org
Thu Aug 28 16:58:01 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gothinclient.
commit 904414b3b05865844e6a2e90e6b920bbc1f3a36b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 28 16:57:21 2014 +0200
FIXME: install x2goclient and lightdm prior to x2gothinclient-minidesktop
---
management/sbin/x2gothinclient_create | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/management/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create
index 256c507..8affabe 100755
--- a/management/sbin/x2gothinclient_create
+++ b/management/sbin/x2gothinclient_create
@@ -200,12 +200,14 @@ fi
[ \$? -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 x2gothinclient-chroot x2gothinclient-${TC_FLAVOUR} -y
-
if [ "x$TC_FLAVOUR" = "xminidesktop" ]; then
- x2gothinclient-minidesktop-preseed
+ # FIXME: this should be addressed by package deps, but currently won't work...
+ apt-get install x2goclient lightdm -y
fi
+[ \$? -eq 0 ] && apt-get install x2gothinclient-chroot x2gothinclient-${TC_FLAVOUR} -y
+
+
# blacklist kernel modules
[ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf
[ \$? -eq 0 ] && for mod in $TC_MODULE_BLACKLIST; do echo "blacklist \$mod" >> /etc/modprobe.d/blacklist.conf; done
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
More information about the x2go-commits
mailing list