[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-123-gf2e8982
X2Go dev team
git-admin at x2go.org
Thu Dec 19 22:36:03 CET 2013
The branch, master has been updated
via f2e898266e4e0637743257d860fc3fa54a8004d1 (commit)
from 98993db402fd09fb4c8787729e8226fbe8866d6f (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 f2e898266e4e0637743257d860fc3fa54a8004d1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Dec 19 22:31:35 2013 +0100
rpm/*.init: on RHEL6 init.d/functions cannot handle -u bash option
-----------------------------------------------------------------------
Summary of changes:
rpm/x2gobroker-authservice.init | 8 ++++----
rpm/x2gobroker-daemon.init | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init
index 0f8dae0..b73ce43 100644
--- a/rpm/x2gobroker-authservice.init
+++ b/rpm/x2gobroker-authservice.init
@@ -15,7 +15,10 @@
# Description: PAM authentication service for X2Go Session Broker
### END INIT INFO
-set -eu
+set -e
+
+# Source function library.
+. /etc/rc.d/init.d/functions
AUTHSERVICE=/usr/sbin/x2gobroker-authservice
test -d /run && RUNDIR=/run || RUNDIR=/var/run
@@ -44,9 +47,6 @@ export X2GOBROKER_DAEMON_USER
export X2GOBROKER_DAEMON_GROUP
export X2GOBROKER_AUTHSERVICE_SOCKET
-# Source function library.
-. /etc/rc.d/init.d/functions
-
exec=$AUTHSERVICE
prog=$(basename $AUTHSERVICE)
config=$DEFAULTCONFIG_AUTHSERVICE
diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init
index 13a71fe..b653a17 100644
--- a/rpm/x2gobroker-daemon.init
+++ b/rpm/x2gobroker-daemon.init
@@ -15,7 +15,7 @@
# Description: X2Go Session Broker comes with its own HTTP daemon
### END INIT INFO
-set -eu
+set -e
DAEMON=/usr/bin/x2gobroker
test -d /run && RUNDIR=/run || RUNDIR=/var/run
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).
More information about the x2go-commits
mailing list