x2goserver-4.0.1.19-use_bash_in_Xsession.patch 1.4 KB

123456789101112131415161718192021222324252627
  1. X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver-xsession%2Fetc%2FXsession;h=7ad477ffc439ef0f7f0ccbbee40f55504a8f2dd6;hp=ab32a1062cdbec6b3ccbea29682d240f06046394;hb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d;hpb=1cc93d59f6bb2559b1c42daba26cf3b9b50f3e69
  2. diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
  3. index ab32a10..7ad477f 100755
  4. --- a/x2goserver-xsession/etc/Xsession
  5. +++ b/x2goserver-xsession/etc/Xsession
  6. @@ -208,16 +208,16 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-
  7. # XCLIENTS_D=/etc/x2go/Xclients.d
  8. #if [ -d "$XCLIENTS_D" -a -x "$XCLIENTS_D/Xclients.${XSESSION_EXEC}.sh" ]; then
  9. - # exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
  10. + # exec /bin/bash -c "exec -l \"$SHELL\" -c \"$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh\""
  11. #fi
  12. # switchdesk support is also totally deprecated in RHEL, but we leave it here
  13. # as a reminder, as well, in case we need it in the future for special setups...
  14. #if [ -x "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}" ]; then
  15. - # exec -l "$SHELL" -c "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}";
  16. + # exec /bin/bash -c "exec -l \"$SHELL\" -c \"$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}\""
  17. #fi
  18. - exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$STARTUP\""
  19. + exec $CK_XINIT_SESSION $SSH_AGENT /bin/bash -c "exec -l \"$SHELL\" -c \"$STARTUP\""
  20. fi
  21. exit 0