This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit c6d60ce554d3514cf3b6166ad37d459025aa85d9 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Mar 1 23:04:44 2018 +0100 modify x2gothinclientd to start scripts needed by gpg agent. --- debian/changelog | 1 + displaymanager/sbin/x2gothinclientd | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 77ff588..30a58a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -146,6 +146,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low * fix x2gothinclient_update to create files needed by x2gothinclientd * let user choose architecture by setting TC_ARCH variable. Default amd64. * improve support for gnupg and dbus. + * modify x2gothinclientd to start scripts needed by gpg agent. [ Martti Pitkänen ] * debian/po: diff --git a/displaymanager/sbin/x2gothinclientd b/displaymanager/sbin/x2gothinclientd index 3096994..43c87a8 100755 --- a/displaymanager/sbin/x2gothinclientd +++ b/displaymanager/sbin/x2gothinclientd @@ -110,8 +110,6 @@ elsif ($pid == 0 ) # wait for X-Server to come up sleep(3); - # execute Xsession file - qx(su - x2gothinclient -c \"export DISPLAY=:0; /etc/X11/Xsession 1>/dev/null 2>/dev/null\"); # Align displays next to each other in order of appearance in xrandr, unless touch # devices are detected - in that case, clone displays so that touchable area and display @@ -190,7 +188,19 @@ elsif ($pid == 0 ) # test if x2goclient is running, if not launch it... if ( !check_client() ) { - qx(su - x2gothinclient -c \"export DISPLAY=:0; /etc/x2go/x2gothinclient_start\ 1>/dev/null 2>/dev/null"); + open (F,">/tmp/startwrap"); +print F "#!/bin/bash + + set +e +. /etc/X11/Xsession.d/20dbus_xdg-runtime +. /etc/X11/Xsession.d/75dbus_dbus-launch +. /etc/X11/Xsession.d/90gpg-agent +. /etc/X11/Xsession.d/95dbus_update-activation-env + set -e\n"; + close (F); + qx(cat /etc/x2go/x2gothinclient_start >> /tmp/startwrap); + chmod(0755, "/tmp/startwrap"); + qx(su - x2gothinclient -c \"export DISPLAY=:0; /tmp/startwrap 1>/dev/null 2>/dev/null\"); } } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git