#!/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"}
-nm=${NM-"python /usr/share/NodeManager/nm.py"}
+nodemanager=${NODEMANAGER-"python /usr/share/NodeManager/nodemanager.py"}
prog="Node Manager"
-pidfile=${PIDFILE-/var/run/nm.pid}
-lockfile=${LOCKFILE-/var/lock/subsys/nm}
+pidfile=${PIDFILE-/var/run/nodemanager.pid}
RETVAL=0
function start() {
- echo -n $"Starting $prog: "
- daemon --check=nm $nm "$@"
- 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 nm
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
+ action $"Stopping $prog: " killproc -p $pidfile nodemanager
}
case "$1" in
stop
;;
status)
- status $nm
+ status -p $pidfile nodemanager
RETVAL=$?
;;
restart|reload)
shift
stop
- start $restartoptions "$@"
+ start $options "$@"
;;
condrestart)
shift
- [ -f ${pidfile} ] && { stop; start $restartoptions "$@"; }
+ [ -f ${pidfile} ] && { stop; start $options "$@"; }
;;
restartverbose)
shift
stop
- $nm $verboseoptions "$@"
+ $nodemanager $verboseoptions "$@"
;;
restartdebug)
shift
stop
echo "Restarting with $debugoptions $@ .."
- $nm $debugoptions "$@"
+ $nodemanager $debugoptions "$@"
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|restartdebug [-d]}"