This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox in repository live-build-x2go. commit dfa10c735d3918e3fcaedebb973eb7c0636449d7 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jan 18 21:12:52 2019 +0000 added support for background images (well, a single image, actually, and no solid colors) via xroot= boot parameter in MATE-MiniDesktop mode --- .../includes.chroot/etc/X11/Xsession.d/60x11-set-background | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-background b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-background index 1643523..e3b6b90 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-background +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-background @@ -3,8 +3,6 @@ XROOT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \( XROOTMODE=$(cat /proc/cmdline | tr ' ' '\n' | awk -F'=' '"xrootmode"==$1 {print $2}') IMAGEDIR=/var/tmp/images/ -# TODO: mate-minidesktop: image is stored as /usr/share/backgrounds/x2go/x2gothinclient-minidesktop_background.svg - needs to be svg - if [ -n "$XROOT" ] ; then XROOTSHORT=$(echo "$XROOT" | tr -dc '0-9a-fA-Fx') @@ -30,7 +28,16 @@ if [ -n "$XROOT" ] ; then *) POSITION=max ;; esac # POSITION: center fill max scale tile; default: max - feh --no-fehbg --bg-$POSITION $IMAGEDIR/background/* + if [ -f "/etc/x2go/x2gothinclient-minidesktop_start" ] ; then + # We're running in X2Go-TCE-MATE-MiniDesktop + # only 1 image supported (so far) + # no background colors supported (so far) + # but, in TCE-MMD, we can use SVG images in addition to PNG, JPG, etc. + update-alternatives --remove desktop-background /usr/share/backgrounds/x2go/x2gothinclient-minidesktop_background.svg + update-alternatives --install /usr/share/images/desktop-base/desktop-background desktop-background $(ls -1 $IMAGEDIR/background/*| head -1) 10 + else + feh --no-fehbg --bg-$POSITION $IMAGEDIR/background/* + fi else xsetroot -grey # show that something's amiss fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git