[X2Go-Commits] [x2goserver] 02/08: x2goserver/bin/x2goruncommand: use dbus-run-session to start a new dbus user session if available.

git-admin at x2go.org git-admin at x2go.org
Wed Nov 1 10:24:08 CET 2017


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

x2go pushed a commit to branch master
in repository x2goserver.

commit 21dc027805b14e7651300c16d13f0d6268836833
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Nov 1 08:36:50 2017 +0100

    x2goserver/bin/x2goruncommand: use dbus-run-session to start a new dbus user session if available.
    
    Only for full desktop sessions.
    
    Backported from a Debian patch.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog              |  3 +++
 x2goserver/bin/x2goruncommand | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dc814eb..7b20f55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -295,6 +295,9 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
     - x2goserver/lib/x2go{sqlitewrapper.pl,utils.pm}: allow arbitrary-length
       user names, user names starting with digits and drop $ as a valid user
       name character. Fixes: #1229.
+    - x2goserver/bin/x2goruncommand: use dbus-run-session to start a new dbus
+      user session if available. Only for full desktop sessions. Backported
+      from a Debian patch.
   * x2goserver.spec:
     - Add mandatory perl-generators Build-Requires as per
       https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 5b5cf4f..c099ec5 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -364,8 +364,16 @@ if [ "$EXEC" != "" ] && [ -x "$EXEC" ]; then
 
 	if x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ]; then
 		STARTUP="$cmd$args"
+
+		# Search for dbus-run-session and handle the non-existence (to some extent) gracefully.
+		typeset dbus_wrapper="$(type -P "dbus-run-session")"
+
 		"$X2GO_LIB_PATH/x2gosyslog" "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\""
-		XSESSION_EXEC="$cmd" STARTUP="/usr/bin/env LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${STARTUP}" /etc/x2go/Xsession >> "$MESSAGE_FILE" 2>&1
+		typeset dbus_wrapper_msg="available as ${dbus_wrapper}"
+		[[ -z "${dbus_wrapper}" ]] && dbus_wrapper_msg="not available"
+		"${X2GO_LIB_PATH}/x2gosyslog" "${0}" "notice" "dbus wrapper ${dbus_wrapper_msg}"
+
+		XSESSION_EXEC="$cmd" STARTUP="/usr/bin/env LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${STARTUP}" ${dbus_wrapper} /etc/x2go/Xsession >> "$MESSAGE_FILE" 2>&1
 	else
 		"$X2GO_LIB_PATH/x2gosyslog" "$0" "debug" "executing command \"$cmd$args\"..."
 

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


More information about the x2go-commits mailing list