[X2Go-Commits] [x2gothinclient] 11/11: init scripts: Use /run rather than /var/run for placing PID files.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit f5b2da2bb1789210bb084878d1eb53fe71b96773
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 27 09:05:28 2019 +0100

    init scripts: Use /run rather than /var/run for placing PID files.
---
 cdmanager/init/x2gothinclient-cdmanager.init           |  8 ++++----
 debian/changelog                                       |  1 +
 displaymanager/init/x2gothinclient-displaymanager.init | 12 ++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cdmanager/init/x2gothinclient-cdmanager.init b/cdmanager/init/x2gothinclient-cdmanager.init
index 7ef81bf..e812f5e 100644
--- a/cdmanager/init/x2gothinclient-cdmanager.init
+++ b/cdmanager/init/x2gothinclient-cdmanager.init
@@ -52,22 +52,22 @@ case "$1" in
 		# only start the X2Go CD Manager if x2gothinclientd is configured as the default display manager
 		if [ -e /etc/X11/default-display-manager ] && [ "$(cat /etc/X11/default-display-manager)" = "/usr/sbin/x2gothinclientd" ]; then
 			log_daemon_msg "Starting $DESC" "x2gocdmanager"
-			start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+			start-stop-daemon --start --quiet --pidfile /run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
 			log_end_msg $?
 		fi
 	;;
 	stop)
 		log_daemon_msg "Stopping $DESC" "x2gocdmanager"
-		start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid || true
+		start-stop-daemon --oknodo --stop --quiet --pidfile /run/$NAME.pid || true
 		log_end_msg $?
 	;;
 	status)
 		log_daemon_msg "Status of $DESC" "x2gocdmanager"
-		start-stop-daemon --oknodo --status --quiet --pidfile /var/run/$NAME.pid || true
+		start-stop-daemon --oknodo --status --quiet --pidfile /run/$NAME.pid || true
 		log_end_msg $?
 	;;
 	force-reload)
-		start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0
+		start-stop-daemon --stop --test --quiet --pidfile /run/$NAME.pid && $0 restart || exit 0
 	;;
 	restart)
 		log_daemon_msg "Restarting $DESC" "x2gocdmanager"
diff --git a/debian/changelog b/debian/changelog
index d35c0b0..a9f05c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ x2gothinclient (1.5.0.1-0x2go2) UNRELEASED; urgency=medium
       a no-op script.
     - Provide systemd service files for x2gothinclient-cdmanager and
       x2gothinclient-displaymanager.
+    - init scripts: Use /run rather than /var/run for placing PID files.
   * debian/rules:
     + Convert to pure debhelper rules file.
     + Remove Qt5 build cruft from cdmanager/powerej/.
diff --git a/displaymanager/init/x2gothinclient-displaymanager.init b/displaymanager/init/x2gothinclient-displaymanager.init
index 822d6c9..0e3c54f 100644
--- a/displaymanager/init/x2gothinclient-displaymanager.init
+++ b/displaymanager/init/x2gothinclient-displaymanager.init
@@ -68,27 +68,27 @@ case "$1" in
 			log_action_msg "Not starting X2Go Client in TCE mode; it is not configured as default display manager"
 		else
 			log_daemon_msg "Starting $DESC" "x2gothinclientd"
-			start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+			start-stop-daemon --start --quiet --pidfile /run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
 			log_end_msg $?
 		fi
 	;;
 	status)
-		if [ -e /var/run/$NAME.pid ]; then
+		if [ -e /run/$NAME.pid ]; then
 			log_daemon_msg "Status of $DESC" "x2gothinclientd"
-			start-stop-daemon --oknodo --status --quiet --pidfile /var/run/$NAME.pid
+			start-stop-daemon --oknodo --status --quiet --pidfile /run/$NAME.pid
 			log_end_msg $?
 		fi
 	;;
 	stop)
-		if [ -e /var/run/$NAME.pid ]; then
+		if [ -e /run/$NAME.pid ]; then
 			log_daemon_msg "Stopping $DESC" "x2gothinclientd"
-			start-stop-daemon --oknodo --stop --quiet --retry 10 --pidfile /var/run/$NAME.pid
+			start-stop-daemon --oknodo --stop --quiet --retry 10 --pidfile /run/$NAME.pid
 			log_end_msg $?
 		fi
 	;;
 	force-reload)
 		# check wether $DAEMON is running. If so, restart
-		start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0
+		start-stop-daemon --stop --test --quiet --pidfile /run/$NAME.pid && $0 restart || exit 0
 	;;
 	restart)
 		$0 stop

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git