[Xen-changelog] [xen-unstable] tools/hotplug/Linux: fix completely wrong attempts to stop xenwatchdogd

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User user virtual <virtualusr@xxxxxxxxx>
# Date 1295973720 0
# Node ID b5579db3dabf032714cbb59b2413c3dc276ba9e8
# Parent  5e91e7a6b1302908c3d65d15210e5c34c876c1cb
tools/hotplug/Linux: fix completely wrong attempts to stop xenwatchdogd

"xen-watchdog stop" attempts to kill non existing "watchdogd" but
misses the running "xenwatchdogd".  This also provokes errors during
install and Debian package management.

Signed-off-by: user virtual <virtualusr@xxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/hotplug/Linux/init.d/xen-watchdog |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r 5e91e7a6b130 -r b5579db3dabf tools/hotplug/Linux/init.d/xen-watchdog
--- a/tools/hotplug/Linux/init.d/xen-watchdog   Tue Jan 25 14:07:39 2011 +0000
+++ b/tools/hotplug/Linux/init.d/xen-watchdog   Tue Jan 25 16:42:00 2011 +0000
@@ -16,6 +16,9 @@
 # Description:       Run domain watchdog daemon.
 ### END INIT INFO
 #
+
+DAEMON=/usr/sbin/xenwatchdogd
+base=$(basename $DAEMON)
 
 # Source function library.
 if [ -e  /etc/init.d/functions ] ; then
@@ -39,10 +42,9 @@ fi
 
 start() {
        local r
-       base="watchdogd"
        echo -n $"Starting domain watchdog daemon: "
 
-       /usr/sbin/xenwatchdogd 30 15
+       $DAEMON 30 15
        r=$?
        [ "$r" -eq 0 ] && success $"$base startup" || failure $"$base startup"
        echo
@@ -52,10 +54,9 @@ start() {
 
 stop() {
        local r
-       base="watchdogd"
        echo -n $"Stopping domain watchdog daemon: "
 
-       killall -USR1 watchdogd 2>/dev/null
+       killall -USR1 $base 2>/dev/null
        r=$?
        [ "$r" -eq 0 ] && success $"$base stop" || failure $"$base stop"
        echo

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog