From 51100af154e5b025ef1dae2c68d9bf5746cb79bf Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 30 Sep 2017 12:58:06 +0100 Subject: [PATCH] [x86] hyperv-daemons: Use pid file name in init script status operation While we're here, also drop the unnecessary commands to replicate the exit code. --- debian/changelog | 1 + debian/hyperv-daemons.hv-fcopy-daemon.init | 2 +- debian/hyperv-daemons.hv-kvp-daemon.init | 2 +- debian/hyperv-daemons.hv-vss-daemon.init | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0bb35e76..8c06020b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium TRANSPARENT_HUGEPAGE_MADVISE * ALSA: Enable SND_OSSEMUL, a new dependency of SND_{MIXER,PCM}_OSS * [armel] rtc: Disable RTC_NVMEM + * [x86] hyperv-daemons: Use pid file name in init script status operation [ Uwe Kleine-König ] * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin diff --git a/debian/hyperv-daemons.hv-fcopy-daemon.init b/debian/hyperv-daemons.hv-fcopy-daemon.init index 24d944d01..923b67b63 100755 --- a/debian/hyperv-daemons.hv-fcopy-daemon.init +++ b/debian/hyperv-daemons.hv-fcopy-daemon.init @@ -81,7 +81,7 @@ case "$1" in esac ;; status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" ;; restart|force-reload) log_daemon_msg "Restarting $DESC" "$NAME" diff --git a/debian/hyperv-daemons.hv-kvp-daemon.init b/debian/hyperv-daemons.hv-kvp-daemon.init index e5908ec28..bf1623076 100755 --- a/debian/hyperv-daemons.hv-kvp-daemon.init +++ b/debian/hyperv-daemons.hv-kvp-daemon.init @@ -80,7 +80,7 @@ case "$1" in esac ;; status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" ;; restart|force-reload) log_daemon_msg "Restarting $DESC" "$NAME" diff --git a/debian/hyperv-daemons.hv-vss-daemon.init b/debian/hyperv-daemons.hv-vss-daemon.init index aff28fcbe..a99d8f2be 100755 --- a/debian/hyperv-daemons.hv-vss-daemon.init +++ b/debian/hyperv-daemons.hv-vss-daemon.init @@ -80,7 +80,7 @@ case "$1" in esac ;; status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" ;; restart|force-reload) log_daemon_msg "Restarting $DESC" "$NAME"