git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, too much messing about
[nodemanager.git]
/
initscripts
/
nm
diff --git
a/initscripts/nm
b/initscripts/nm
index
b0b1d11
..
13f30ed
100755
(executable)
--- a/
initscripts/nm
+++ b/
initscripts/nm
@@
-1,24
+1,24
@@
#!/bin/bash
#
#!/bin/bash
#
-# $Id$
-# $URL$
-#
# nm Starts and stops Node Manager daemon
#
# 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
# 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"}
# 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"}
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
restart|reload)
shift
stop
- start $
restart
options "$@"
+ start $options "$@"
;;
condrestart)
shift
;;
condrestart)
shift
- [ -f ${pidfile} ] && { stop; start $
restart
options "$@"; }
+ [ -f ${pidfile} ] && { stop; start $options "$@"; }
;;
restartverbose)
shift
;;
restartverbose)
shift