This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 671cb71ca2301ee1f9aac41ba1594ef17f237ac5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 26 17:36:48 2014 +0200 addapt management package to TCE flavouring --- management/etc/x2gothinclient_settings | 4 ++++ management/sbin/x2gothinclient_create | 15 ++++++++++++--- management/sbin/x2gothinclient_update | 11 +++++------ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/management/etc/x2gothinclient_settings b/management/etc/x2gothinclient_settings index 1314767..c4806e4 100644 --- a/management/etc/x2gothinclient_settings +++ b/management/etc/x2gothinclient_settings @@ -24,6 +24,9 @@ TC_PRETTY_NAME="X2Go TCE" # Adapt to your system!!! This path fits for Debian systems. Or provide the version manually. TC_VERSION=`cat /usr/share/x2go/versions/VERSION.x2gothinclient-management` +# select the TCE flavour (classical: "displaymanager", minimal MATE desktop shell: "minidesktop") +TC_FLAVOUR="displaymanager" + # base path for X2Go thin client files TC_BASE="/opt/x2gothinclient" @@ -73,6 +76,7 @@ echo "settings:" echo echo "TC_PRETTY_NAME=$TC_PRETTY_NAME" echo "TC_VERSION=$TC_VERSION" +echo "TC_FLAVOUR=$TC_FLAVOUR" echo "TC_BASE=$TC_BASE" echo "TC_CONFIG=$TC_CONFIG" echo "TC_CHROOT=$TC_CHROOT" diff --git a/management/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create index 1fe824b..703184e 100755 --- a/management/sbin/x2gothinclient_create +++ b/management/sbin/x2gothinclient_create @@ -49,6 +49,11 @@ TC_DEBMIRROR_URL="${TC_DEBMIRROR_URL:-'http://ftp.debian.org/debian'}" TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org $TC_DISTRO_CODENAME main'}" TC_MODULE_BLACKLIST="${TC_MODULE_BLACKLIST:-'pcspkr'}" TC_NONINTERACTIVE="${TC_NONINTERACTIVE:-}" +TC_FLAVOUR="${TC_FLAVOUR:-displaymanager}" + +if [ "x$TC_FLAVOUR" != "xminidesktop" ] && [ "x$TC_FLAVOUR" != "xdisplaymanager" ]; then + TC_FLAVOUR="displaymanager" +fi test -e "$TC_CHROOT" && { echo "ERROR: X2Go Thin Client chroot already exists at $TC_CHROOT." @@ -75,9 +80,9 @@ export LANG=C mkdir -p $TC_CONFIG test -f $TC_CONFIG/x2gothinclient_init || cp $SHAREDIR/etc/x2gothinclient_init $TC_CONFIG -test -f $TC_CONFIG/x2gothinclient_start || cp $SHAREDIR/etc/x2gothinclient_start $TC_CONFIG +test -f $TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_start || cp $SHAREDIR/etc/x2gothinclient-${TC_FLAVOUR}_start $TC_CONFIG test -f $TC_CONFIG/x2gothinclient_sessions || cp $SHAREDIR/etc/x2gothinclient_sessions $TC_CONFIG -test -f $TC_CONFIG/x2goclient-background.svg || cp $SHAREDIR/etc/x2goclient-background.svg $TC_CONFIG +test -f $TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_background.svg || cp $SHAREDIR/etc/x2gothinclient-${TC_FLAVOUR}_background.svg $TC_CONFIG mkdir -p $TC_CONFIG/freerdp test -f $TC_CONFIG/freerdp/known_hosts || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > $TC_CONFIG/freerdp/known_hosts @@ -176,7 +181,11 @@ 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@boot@') && ln -sf \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp -[ \$? -eq 0 ] && apt-get install x2gothinclient-chroot -y +[ \$? -eq 0 ] && apt-get install x2gothinclient-chroot x2gothinclient-${TC_FLAVOUR} -y + +if [ "x$TC_FLAVOUR" = "xminidesktop" ]; then + x2gothinclient-preseed +fi # blacklist kernel modules [ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf diff --git a/management/sbin/x2gothinclient_update b/management/sbin/x2gothinclient_update index 1de7328..cba4788 100755 --- a/management/sbin/x2gothinclient_update +++ b/management/sbin/x2gothinclient_update @@ -66,9 +66,9 @@ if test -f $TC_CONFIG/x2gothinclient_init; then chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init fi -if test -f $TC_CONFIG/x2gothinclient_start; then - cp -v "$TC_CONFIG/x2gothinclient_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start" - chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start" +if test -f $TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_start; then + cp -v "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_start" "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_start" + chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_start" fi if test -f $TC_CONFIG/x2gothinclient_sessions; then @@ -76,8 +76,8 @@ if test -f $TC_CONFIG/x2gothinclient_sessions; then chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" fi -if test -f $TC_CONFIG/x2goclient-background.svg; then - cp -v "$TC_CONFIG/x2goclient-background.svg" "$TC_CHROOT/etc/x2go/x2goclient-background.svg" +if test -f $TC_CONFIG/x2gothinclient--${TC_FLAVOUR}_background.svg; then + cp -v "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_background.svg" "$TC_CHROOT/etc/x2go/x2gothinclient-${TC_FLAVOUR}_background.svg" fi if test -f $TC_CONFIG/freerdp/known_hosts; then @@ -86,4 +86,3 @@ if test -f $TC_CONFIG/freerdp/known_hosts; then fi echo - -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git