[X2Go-Commits] [x2goserver] 01/02: Fix wrong path to xinitrd.d in Xsession (section for RPM based distros). Also, add some existence/readability checking. (Fixes: #414).

[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 b3717e6fcae16de8e695dee5ba78021b5ab6e39a
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jan 28 18:57:58 2014 +0100

    Fix wrong path to xinitrd.d in Xsession (section for RPM based distros). Also, add some existence/readability checking. (Fixes: #414).
---
 debian/changelog                 |    6 ++++++
 x2goserver-xsession/etc/Xsession |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a121f94..6b201f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * New upstream release (4.0.1.14):
     - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log.
       (Fixes: #415).
 
+  [ Orion Poplawski ]
+  * New upstream release (4.0.1.14):
+    - Fix wrong path to xinitrd.d in Xsession (section for RPM based distros).
+      Also, add some existence/readability checking. (Fixes: #414).
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 28 Jan 2014 13:41:38 +0100
 
 x2goserver (4.0.1.13-0x2go1) unstable; urgency=low
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 9630db8..5dbdd35 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -174,8 +174,8 @@ elif [ -f /etc/redhat-release ]; then
 	unset XKB_IN_USE
 
 	# run all system xinitrc shell scripts.
-	for file in /etc/x2go/xinit/xinitrc.d/* ; do
-		. $file
+	for file in /etc/x2go/xinitrc.d/* ; do
+		[ -r "$file" ] && . $file
 	done
 
 	# Prefix launch of session with ssh-agent if available and not already running.

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git