The branch, master has been updated
via b06196d55c25a7e3b9cfa9ab21a67b9f4e35eec9 (commit)
from e4ec07e660ed436acefb7ef2322f864a4c1b6ee9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b06196d55c25a7e3b9cfa9ab21a67b9f4e35eec9
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 18 11:41:30 2013 +0100
Different Linux distros have pidof installed in different locations. If pidof is not available, we brutally kill all instances of x2godesktopsharing when a session suspends.
-----------------------------------------------------------------------
Summary of changes:
bin/x2goterminate-desktopsharing | 14 +++++++++++++-
debian/changelog | 3 +++
2 files changed, 16 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/bin/x2goterminate-desktopsharing b/bin/x2goterminate-desktopsharing
index 986ef0b..7792582 100755
--- a/bin/x2goterminate-desktopsharing
+++ b/bin/x2goterminate-desktopsharing
@@ -29,11 +29,23 @@ fi
X2GO_LIB_PATH=`x2gopath libexec`
+if type -p pidof 1>/dev/null 2>/dev/null; then
+ PIDOF=pidof
+elif [ -x /sbin/pidof ]; then
+ PIDOF=/sbin/pidof
+elif [ -x /usr/sbin/pidof ]; then
+ PIDOF=/usr/sbin/pidof
+else
+ # no pidof utility found, get out the big hammer!!!
+ killall x2godesktopsharing
+ exit 0
+fi
+
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2)
-for process_id in `pidof x2godesktopsharing`; do
+for process_id in `$PIDOF x2godesktopsharing`; do
env_of_process=$(cat -A /proc/$process_id/environ)
env_of_process=${env_of_process//^@/\\n}
display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2)
diff --git a/debian/changelog b/debian/changelog
index 24f2191..3d12002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low
- Update man pages (Fixes: #281).
- Fix FSF address in COPYING file.
- Use x2gopath in scripts rather than deprecated x2gobasepath.
+ - Different Linux distros have pidof installed in different
+ locations. If pidof is not available, we brutally kill all instances
+ of x2godesktopsharing when a session suspends.
* debian/control:
+ Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
+ Rework LONG_DESCRIPTION in several other aspects.
hooks/post-receive
--
x2godesktopsharing.git (Desktop Sharing for X2Go)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).