[X2Go-Commits] [x2goserver] 01/01: Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand or /etc/SuSE-release for SUSE system recognition). (Fixes: #671).

[git-admin at x2go.org]

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 6430968500a690634a7bb21636b690a0e7c03ca1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Nov 13 15:04:22 2014 +0100

    Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand or /etc/SuSE-release for SUSE system recognition). (Fixes: #671).
---
 debian/changelog                 |    4 ++--
 x2goserver-xsession/etc/Xsession |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac6fe0e..33fb844 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     - Hack for x2goserver-xsession/Makefile during SUSE builds. If
       directoy /usr/share/doc/packages/brp-check-suse is present, the build env
       is also considered to be a SUSE system.
-    - Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand for
-      SUSE system recognition). (Fixes: #671).
+    - Trigger Xsession code for SUSE systems (look for /etc/SUSE-brand or
+      /etc/SuSE-release for SUSE system recognition). (Fixes: #671).
     - x2gosqlitewrapper.c: Fix rpmlint error: no-return-in-nonvoid-function.
       Return the exitcode of execve().
     - Fix gramma in error message (in x2goresume-session).
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 3b85b9e..2104c9c 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -130,7 +130,7 @@ if [ -f /etc/debian_version ]; then
 		done
 		set -e
 	fi
-elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ]; then
+elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-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/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git