X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.init;h=eda0f11f235076631d2008bb89fd219840d5630a;hb=refs%2Fheads%2F1.8;hp=5ba44e89066a368c21f22225ca3bfa5ea213925e;hpb=87752445f58be6a806ff452fa24bf4388393a973;p=nodemanager.git

diff --git a/nm.init b/nm.init
index 5ba44e8..eda0f11 100755
--- a/nm.init
+++ b/nm.init
@@ -15,16 +15,16 @@ fi
 
 nm=${NM-"python /usr/share/NodeManager/nm.py"}
 prog="Node Manager"
-restartoptions=
+options=${OPTIONS-"-d -s"}
+restartoptions=${RESTARTOPTIONS-"-d"}
 pidfile=${PIDFILE-/var/run/nm.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/nm}
 RETVAL=0
 
 do_start()
 {
-    options=$1
     echo -n $"Starting $prog: "
-    daemon --check=nm $nm $options
+    daemon --check=nm $nm "$@"
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch ${lockfile}
@@ -33,7 +33,7 @@ do_start()
 
 start()
 {
-    do_start ${OPTIONS-"-d -s"}
+    do_start $options
 }
 
 stop()
@@ -43,16 +43,12 @@ stop()
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
-    for i in $( vps aux | grep nm.py | awk '{print $2}' ); do
-        kill -9 $i
-    done
-
 }
 
 restart()
 {
     stop
-    do_start ${OPTIONS-"-d"}
+    do_start $restartoptions
 }