This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 7ae2669b596d3b84f0ba09552d5a8c0e653ce86d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 20 20:29:56 2016 +0100 x2goserver-xsession/etc/Xsession: use /bin/bash explicitly on RedHat-, Gentoo- and SuSE-based systems. Users might change /bin/sh to point to a shell like mksh or dash, which do not support the -l or -c flags to exec. C.f., BGO #575022 (Gentoo.) --- debian/changelog | 4 ++++ x2goserver-xsession/etc/Xsession | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a7fadf..4202995 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,10 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - x2goserver/bin/x2gocleansessions: replace system_capture_stdout_output() with actual implementation. We don't have that function on the release branch. + - x2goserver-xsession/etc/Xsession: use /bin/bash explicitly on RedHat-, + Gentoo- and SuSE-based systems. Users might change /bin/sh to point to a + shell like mksh or dash, which do not support the -l or -c flags to + exec. C.f., BGO #575022 (Gentoo.) * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index ab32a10..7ad477f 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -208,16 +208,16 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE- # XCLIENTS_D=/etc/x2go/Xclients.d #if [ -d "$XCLIENTS_D" -a -x "$XCLIENTS_D/Xclients.${XSESSION_EXEC}.sh" ]; then - # exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh" + # exec /bin/bash -c "exec -l \"$SHELL\" -c \"$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh\"" #fi # switchdesk support is also totally deprecated in RHEL, but we leave it here # as a reminder, as well, in case we need it in the future for special setups... #if [ -x "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}" ]; then - # exec -l "$SHELL" -c "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}"; + # exec /bin/bash -c "exec -l \"$SHELL\" -c \"$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}\"" #fi - exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$STARTUP\"" + exec $CK_XINIT_SESSION $SSH_AGENT /bin/bash -c "exec -l \"$SHELL\" -c \"$STARTUP\"" fi exit 0 -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git