[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-80-g6e6ebae
X2Go dev team
git-admin at x2go.org
Fri Jul 19 23:38:13 CEST 2013
The branch, build-main has been updated
via 6e6ebae510f6fdf0c547e9908e5e471cc9e05a14 (commit)
from 55b9ba6b3223f5aec50c3b0c18250efd17f93f3c (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/x2gocdmanager.init | 44 +++++++++++++++-----------------------------
1 file changed, 15 insertions(+), 29 deletions(-)
The diff of changes is:
diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init
index a7d6e8a..38fc91d 100644
--- a/debian/x2gocdmanager.init
+++ b/debian/x2gocdmanager.init
@@ -29,6 +29,16 @@
# Short-Description: Start and stop the x2go CD/DVD manager daemon
### END INIT INFO
+set -e
+
+# use system's locale settings for the X2Go Client in TCE mode
+if [ -r /etc/default/locale ]; then
+ . /etc/default/locale
+ export LANG LANGUAGE
+fi
+
+. /lib/lsb/init-functions
+
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
export HOSTNAME
DAEMON=/usr/sbin/x2gocdmanager
@@ -37,41 +47,18 @@ DESC=x2gocdmanager
test -x $DAEMON || exit 0
-
-set -e
-
case "$1" in
start)
- echo -n "Starting $DESC: "
- start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
- --exec $DAEMON -- $DAEMON_OPTS
- echo "$NAME."
+ log_daemon_msg "Starting $DESC" "x2gocdmanager"
+ start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+ log_end_msg $?
;;
stop)
- echo -n "Stopping $DESC: "
+ log_daemon_msg "Stopping $DESC" "x2gocdmanager"
start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid || true
-
- echo "$NAME."
+ log_end_msg $?
;;
- #reload)
- #
- # If the daemon can reload its config files on the fly
- # for example by sending it SIGHUP, do it here.
- #
- # If the daemon responds to changes in its config file
- # directly anyway, make this a do-nothing entry.
- #
- # echo "Reloading $DESC configuration files."
- # start-stop-daemon --stop --signal 1 --quiet --pidfile \
- # /var/run/$NAME.pid --exec $DAEMON
- #;;
force-reload)
- #
- # If the "reload" option is implemented, move the "force-reload"
- # option to the "reload" entry above. If not, "force-reload" is
- # just the same as "restart" except that it does nothing if the
- # daemon isn't already running.
- # check wether $DAEMON is running. If so, restart
start-stop-daemon --stop --test --quiet --pidfile \
/var/run/$NAME.pid \
&& $0 restart \
@@ -88,7 +75,6 @@ case "$1" in
;;
*)
N=/etc/init.d/$NAME
- # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
hooks/post-receive
--
x2gothinclient.git (X2Go Thin Client Environment)
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 "x2gothinclient.git" (X2Go Thin Client Environment).
More information about the x2go-commits
mailing list