[X2Go-Commits] [live-build-x2go] 01/02: Handle backgroundurl and brandingurl kernel options for X2Go Client's --background and --branding parameters.

[git-admin at x2go.org]

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 b432b4f506e1fb4ced0096bf7b1f76bf5465df2a
Author: Seth Galitzer <sgsax at ksu.edu>
Date:   Tue Apr 25 23:05:32 2017 +0200

    Handle backgroundurl and brandingurl kernel options for X2Go Client's --background and --branding parameters.
---
 .../lib/live/config/2800-x2go-thinclientconfig     | 39 +++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index 2bb146b..1cb0cbb 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -138,7 +138,20 @@ if [ -n "\$BLANKINGTIME" ]; then
 	fi
 fi
 
-x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM
+# handle additional options for x2goclient passed in as boot parameters
+ADDOPTS=""
+
+# append custom background image if one was retrieved to additional options
+if [ -e /home/user/custom/background.svg ]; then
+    ADDOPTS="\$ADDOPTS --background=/home/user/custom/background.svg"
+fi
+
+# append custom branding image if one was retrieved to additional options
+if [ -e /home/user/custom/background.svg ]; then
+    ADDOPTS="\$ADDOPTS --branding=/home/user/custom/branding.svg"
+fi
+
+x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$ADDOPTS
 XSESSION
 
 chown user:user /home/user/.xsession
@@ -149,6 +162,30 @@ mkdir -p /home/user/{export,logins,mounts}
 chown user:user /home/user/{export,logins,mounts}
 chmod 700 /home/user/{export,logins,mounts}
 
+# handle custom images passed in on boot parameters
+mkdir /home/user/custom
+chown user:user /home/user/custom
+chmod 755 /home/user/custom
+BGURL=$(cat /proc/cmdline | \
+    tr ' ' '\n' | \
+    awk -F'=' ' /^backgroundurl=/ { print $2 }')
+if [ -n $BGURL ]; then
+    /usr/bin/wget $BGURL -q -O /home/user/custom/background.svg
+fi
+BRNDURL=$(cat /proc/cmdline | \
+    tr ' ' '\n' | \
+    awk -F'=' ' /^brandingurl=/ { print $2 }')
+if [ -n $BRNDURL ]; then
+    /usr/bin/wget $BRNDURL -q -O /home/user/custom/branding.svg
+fi
+
+#only try to set permissions if files exist
+CUSTFILES=(/home/user/custom/*)
+if [ -e ${CUSTFILES[0]} ]; then
+    chown user:user /home/user/custom/*
+    chmod 644 /home/user/custom/*
+fi
+
 }
 
 X2GoThinClientConfig

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