From 6ccfc4bdc28d399e2b30794c0fa94ca4c28e5b35 Mon Sep 17 00:00:00 2001
Message-Id: <6ccfc4bdc28d399e2b30794c0fa94ca4c28e5b35.1283420932.git.jdenemar@redhat.com>
From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 20 Aug 2010 15:16:07 +0200
Subject: [PATCH] rhel-daemon

---
 daemon/libvirtd.init.in |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
index aa7870c..c7e6dcf 100644
--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
@@ -37,6 +37,7 @@
 
 SERVICE=libvirtd
 PROCESS=libvirtd
+OLD_PROCESS=libvirt_qemud
 PIDFILE=@localstatedir@/run/$SERVICE.pid
 
 LIBVIRTD_CONFIG=
@@ -69,8 +70,13 @@ start() {
 stop() {
     echo -n $"Stopping $SERVICE daemon: "
 
-    killproc -p $PIDFILE $PROCESS
-    RETVAL=$?
+    if [ "$(pidofproc $OLD_PROCESS)" != "" ]; then
+        killproc $OLD_PROCESS
+        RETVAL=$?
+    else
+        killproc -p $PIDFILE $PROCESS
+        RETVAL=$?
+    fi
     echo
     if [ $RETVAL -eq 0 ]; then
         rm -f @localstatedir@/lock/subsys/$SERVICE
@@ -87,8 +93,13 @@ restart() {
 reload() {
     echo -n $"Reloading $SERVICE configuration: "
 
-    killproc -p $PIDFILE $PROCESS -HUP
-    RETVAL=$?
+    if [ "$(pidofproc $OLD_PROCESS)" != "" ]; then
+        killproc $OLD_PROCESS -HUP
+        RETVAL=$?
+    else
+        killproc -p $PIDFILE $PROCESS -HUP
+        RETVAL=$?
+    fi
     echo
     return $RETVAL
 }
@@ -99,8 +110,13 @@ case "$1" in
         $1
         ;;
     status)
-        status -p $PIDFILE $PROCESS
-        RETVAL=$?
+        if [ "$(pidofproc $OLD_PROCESS)" != "" ]; then
+            status $OLD_PROCESS
+            RETVAL=$?
+        else
+            status -p $PIDFILE $PROCESS
+            RETVAL=$?
+        fi
         ;;
     force-reload)
         reload
-- 
1.7.2.2