[X2Go-Commits] [live-build-x2go] 01/01: fixed tcedebug commandline parameter

[git-admin at x2go.org]

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

x2go pushed a commit to branch heuler/openbox-magic-pixel-workaround-bullseye
in repository live-build-x2go.

commit 51bb1567eb34ae3d634d2727f368c8e5335312a2
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Fri Feb 9 16:29:51 2024 +0100

    fixed tcedebug commandline parameter
---
 .../includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient | 11 ++++++++++-
 .../lib/live/config/2900-x2go-thinclientconfig                |  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
index e22b47e..857c15b 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
+++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient
@@ -100,4 +100,13 @@ if [ -n "$THROTTLEVALUES" ]; then
 	fi
 fi
 
-eval $THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export $LDAPPARAMS $SESSIONFROM $BACKGROUND $BRANDING $STARTSESSION
+# this is for additional debug logging
+if grep -q ' tcedebug' /proc/cmdline; then
+	while ! [ -f /var/log/x2goclient ] ; do
+		echo "'$0' is waiting for the creation of the '/var/log/x2goclient' file."
+		sleep 2
+	done
+	DEBUGPARAMS='--debug 2>&1 | tee /var/log/x2goclient >/dev/tty9'
+fi
+
+eval $THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export $LDAPPARAMS $SESSIONFROM $BACKGROUND $BRANDING $STARTSESSION $DEBUGPARAMS
diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 87860ee..15061a9 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -23,7 +23,6 @@ sed -i -e '/ToggleMaximize/d' /etc/xdg/openbox/rc.xml
 if grep -q ' tcedebug' /proc/cmdline; then
 	touch /var/log/x2goclient
 	chmod 666 /var/log/x2goclient
-	DEBUGPARAMS='--debug 2>&1 | tee /var/log/x2goclient >/dev/tty9'
 fi
 
 # This is needed for File Sharing support (USB media and the like)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git