This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 8fed931 Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415). new b3717e6 Fix wrong path to xinitrd.d in Xsession (section for RPM based distros). Also, add some existence/readability checking. (Fixes: #414). new 8cfebea Correctly quote the tests against $DISTRIB_RELEASE in x2goruncommand that were badly quoted (which caused them to report the wrong result and to create a file called "=" in the user home directory). Aligning all tests to use the same style of quoting fixes this. (Fixes: #409). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 13 +++++++++++++ x2goserver-xsession/etc/Xsession | 4 ++-- x2goserver/bin/x2goruncommand | 6 +++--- 3 files changed, 18 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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@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@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
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 8cfebeab3b3e0fed8a590a4ec3d4c38ef3133f2a Author: Harald Nordgard-Hansen <hhansen@pvv.org> Date: Tue Jan 28 19:04:08 2014 +0100 Correctly quote the tests against $DISTRIB_RELEASE in x2goruncommand that were badly quoted (which caused them to report the wrong result and to create a file called "=" in the user home directory). Aligning all tests to use the same style of quoting fixes this. (Fixes: #409). --- debian/changelog | 7 +++++++ x2goserver/bin/x2goruncommand | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b201f8..4ae7c06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,13 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415). + [ Harald Nordgard-Hansen ] + * New upstream release (4.0.1.14): + - Correctly quote the tests against $DISTRIB_RELEASE in x2goruncommand that + were badly quoted (which caused them to report the wrong result and to + create a file called "=" in the user home directory). Aligning all tests + to use the same style of quoting fixes this. (Fixes: #409). + [ Orion Poplawski ] * New upstream release (4.0.1.14): - Fix wrong path to xinitrd.d in Xsession (section for RPM based distros). diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 6733473..e5a6852 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" >= 12.10 | bc)" == "1" ]; then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 12.10" | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.10 | bc)" == "1" -o "$(echo $DISTRIB_RELEASE == 12.04 | bc)" == "1" ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.10" | bc)" == "1" -o "$(echo "$DISTRIB_RELEASE == 12.04" | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.04 | bc)" == "1" ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.04" | bc)" == "1" ]; then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org