[X2Go-Commits] [x2gothinclient] 02/02: revert an earlier commit that worked around faulty packages

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit f09bb93e50d3a4436723a1d2aca5a3faf61e882b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 29 15:06:01 2014 +0200

    revert an earlier commit that worked around faulty packages
---
 management/sbin/x2gothinclient_create |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/management/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create
index 7310f7c..743225f 100755
--- a/management/sbin/x2gothinclient_create
+++ b/management/sbin/x2gothinclient_create
@@ -204,12 +204,7 @@ 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
 
-if [ "x$TC_FLAVOUR" = "xminidesktop" ]; then
-	# 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
+[ \$? -eq 0 ] && apt-get install x2gothinclient-chroot x2gothinclient-${TC_FLAVOUR} -y --force-yes
 
 
 # blacklist kernel modules

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git