[X2Go-Commits] [x2goserver] 01/01: x2goserver-xsession/etc/Xsession: add support for OS RT via /etc/os-rt-release (file needs to be created by upstream first, bug pending.)
git-admin at x2go.org
git-admin at x2go.org
Wed Oct 25 16:54:56 CEST 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit ba2b65ba6bf740dd54f54a030b23af5c193e99be
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Oct 25 16:53:56 2017 +0200
x2goserver-xsession/etc/Xsession: add support for OS RT via /etc/os-rt-release (file needs to be created by upstream first, bug pending.)
Cherry-picked from release/4.0.1.x branch.
---
debian/changelog | 3 +++
x2goserver-xsession/etc/Xsession | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 462cb5a..c377e8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -284,6 +284,9 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
functions from x2gocleansessions.
- x2goserver/bin/x2golistshadowsessions: mark unavailable functionality
with FIXME comments.
+ - x2goserver-xsession/etc/Xsession: add support for OS RT via
+ /etc/os-rt-release (file needs to be created by upstream first, bug
+ pending.)
* 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 2b20475..3078509 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -145,7 +145,7 @@ if [ -f /etc/debian_version ] || [ -f /etc/devuan_version ]; then
done
set -e
fi
-elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
+elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ]; then
# define a fallback... (should never be needed). The XSESSION_EXEC var gets set in
# X2Go's x2goruncommand script and can be used with obsolete switchdesk or with
--
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