The branch, master has been updated via 73378f1689341cbc22fea9a004e00d2e2c131a2a (commit) from 4b98c6c1e3761c95afbb49ef9f3ba2004407cc45 (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 73378f1689341cbc22fea9a004e00d2e2c131a2a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 9 12:09:25 2014 +0100 improving last commit ----------------------------------------------------------------------- Summary of changes: init/x2gobroker-daemon.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index 4a23b4e..e895793 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -82,7 +82,7 @@ is_true() case "${1:-}" in start) if [ -f $PIDFILE_BROKER ]; then - if ps a -u $X2GOBROKER_DAEMON_USER | grep -v grep | grep "$(basename $DAEMON)" 1>/dev/null 2>/dev/null; then + if ps a -u $X2GOBROKER_DAEMON_USER | egrep -v "(grep|ps)" | grep "$(basename $DAEMON)" 1>/dev/null 2>/dev/null; then log_warning_msg "X2Go Session Broker already running" else log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE_BROKER). Delete it manually!" hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).