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 5c5aad1d5a1fe4806eff68bfab49a9fc5a5417ac Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 18 11:48:59 2017 +0200 x2goserver-xsession/etc/Xsession: support Devuan just like Debian, give useful error message in case the OS is unknown. --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eddaaec..cf21c0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium within values, but we probably don't need this feature anyway. - x2goserver/bin/x2gostartagent: try to enable lingering via systemd's loginctl utility before calling x2goagent. Fixes: #1198. + - x2goserver-xsession/etc/Xsession: support Devuan just like Debian, give + useful error message in case the OS is unknown. * x2goserver.spec: - Add mandatory perl-generators Build-Requires as per https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 52a61bf..2b20475 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -118,7 +118,7 @@ fi rm -f "$WRITE_TEST" -if [ -f /etc/debian_version ]; then +if [ -f /etc/debian_version ] || [ -f /etc/devuan_version ]; then # sanity check; is our session script directory present? if [ ! -d "$SYSSESSIONDIR" ]; then @@ -233,6 +233,8 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE- #fi exec $CK_XINIT_SESSION $SSH_AGENT /bin/bash -c "exec -l \"$SHELL\" -c \"$STARTUP\"" +else + errormsg 'Unknown operating system, XSession startup not implemented!' fi exit 0 -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git