X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscripts%2Fnm;h=13f30ed953fc50f2a5d3bee94ff1f3e6bd177565;hb=ccc7b9c4b76a89faad66867b00d16ac45333b6de;hp=b0b1d119975242f5a3b6b3e3c6aeea93a1bcea1f;hpb=3b859412179e76c2d7aa586abfc38716a6c2ea78;p=nodemanager.git

diff --git a/initscripts/nm b/initscripts/nm
index b0b1d11..13f30ed 100755
--- a/initscripts/nm
+++ b/initscripts/nm
@@ -1,24 +1,24 @@
 #!/bin/bash
 #
-# $Id$
-# $URL$
-#
 # nm       Starts and stops Node Manager daemon
 #
-# chkconfig: 3 86 26
+# chkconfig: 3 97 26
 # description: Starts and stops Node Manager daemon
 #
 
 # Source function library.
 . /etc/init.d/functions
 
-[ -f /etc/sysconfig/NodeManager ] && . /etc/sysconfig/NodeManager
+[ -f /etc/sysconfig/nodemanager ] && . /etc/sysconfig/nodemanager
+
+# Wait for libvirt to finish initializing
+sleep 10
 
-options=${OPTIONS-"-d -s"}
-restartoptions=${RESTARTOPTIONS-"-d"}
+options=${OPTIONS-"-d"}
 # turn on verbosity
 verboseoptions=${DEBUGOPTIONS-"-v -d"}
-# debug mode is interactive, and has faster period
+# debug mode is interactive, and has faster period 
+# run in deamon mode with service nm restardebug -d
 debugoptions=${DEBUGOPTIONS-"-v -p 30 -r 15"}
 
 nodemanager=${NODEMANAGER-"python /usr/share/NodeManager/nodemanager.py"}
@@ -49,11 +49,11 @@ case "$1" in
     restart|reload)
 	shift
 	stop
-	start $restartoptions "$@"
+	start $options "$@"
 	;;
     condrestart)
 	shift
-	[ -f ${pidfile} ] && { stop; start $restartoptions "$@"; }
+	[ -f ${pidfile} ] && { stop; start $options "$@"; }
 	;;
     restartverbose)
 	shift