From 3b859412179e76c2d7aa586abfc38716a6c2ea78 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 24 Jun 2010 11:20:57 +0000
Subject: [PATCH]  uses pidfile for all steps - more robust

---
 initscripts/nm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/initscripts/nm b/initscripts/nm
index 6988f90..b0b1d11 100755
--- a/initscripts/nm
+++ b/initscripts/nm
@@ -24,25 +24,15 @@ debugoptions=${DEBUGOPTIONS-"-v -p 30 -r 15"}
 nodemanager=${NODEMANAGER-"python /usr/share/NodeManager/nodemanager.py"}
 prog="Node Manager"
 pidfile=${PIDFILE-/var/run/nodemanager.pid}
-lockfile=${LOCKFILE-/var/lock/subsys/nodemanager}
 
 RETVAL=0
 
 function start() {
-    echo -n $"Starting $prog: "
-    daemon --check=nodemanager $nodemanager "$@"
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch ${lockfile}
-    return $RETVAL
+    action $"Starting $prog: " daemon --pidfile=$pidfile --check=nodemanager $nodemanager "$@"
 }
 
 function stop() {
-    echo -n $"Stopping $prog: "
-    killproc nodemanager
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
+    action $"Stopping $prog: " killproc -p $pidfile nodemanager
 }
 
 case "$1" in
@@ -53,7 +43,7 @@ case "$1" in
 	stop
 	;;
     status)
-	status $nodemanager
+	status -p $pidfile nodemanager
 	RETVAL=$?
 	;;
     restart|reload)
-- 
2.47.0