[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-84-gd485ba4

[X2Go dev team]

The branch, build-main has been updated
       via  d485ba449a9668cf4f0a7d004b4c47e61713ac01 (commit)
      from  d3f406d51f4af531037ac956e6ecdfa639a2c79f (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/changelog          |    2 ++
 debian/x2gocdmanager.init |   13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 29492d6..61a7d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
   * Launch X2Go TCE via /etc/X11/default-display-manager. Add debconf template
     to handle default display manager selection. Inspired by Debian's gdm
     package.
+  * Only start X2Go CD Manager if x2gothinclientd is the default display
+    manager.
 
   [ Oleksandr Shneyder ]
   * New upstream version (1.0.99.1):
diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init
index d759d30..b71f3af 100644
--- a/debian/x2gocdmanager.init
+++ b/debian/x2gocdmanager.init
@@ -49,9 +49,12 @@ test -x $DAEMON || exit 0
 
 case "$1" in
 	start)
-		log_daemon_msg "Starting $DESC" "x2gocdmanager"
-		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-		log_end_msg $?
+		# only start the X2Go CD Manager if x2gothinclientd is configured as the default display manager
+		if [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" = "/usr/sbin/x2gothinclientd" ]; then
+			log_daemon_msg "Starting $DESC" "x2gocdmanager"
+			start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+			log_end_msg $?
+		fi
 	;;
 	stop)
 		log_daemon_msg "Stopping $DESC" "x2gocdmanager"
@@ -63,9 +66,9 @@ case "$1" in
 	;;
 	restart)
 		log_daemon_msg "Restarting $DESC" "x2gocdmanager"
-		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
+		$0 stop
 		sleep 1
-		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+		$0 start
 		log_end_msg $?
 	;;
 	*)


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).