Author: qboosh Date: Sun Jan 20 15:34:12 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use functions
- fixed force-reload, added try-reload
---- Files affected:
SOURCES:
nifd.init (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/nifd.init
diff -u SOURCES/nifd.init:1.2 SOURCES/nifd.init:1.3
--- SOURCES/nifd.init:1.2 Thu Dec 8 01:41:26 2005
+++ SOURCES/nifd.init Sun Jan 20 16:34:07 2008
@@ -28,10 +28,7 @@
exit 0
fi
-
-# See how we were called.
-case "$1" in
- start)
+start() {
# Check if the service is already running?
if [ ! -f /var/lock/subsys/nifd ]; then
msg_starting nifd
@@ -41,23 +38,44 @@
else
msg_already_running nifd
fi
- ;;
- stop)
+}
+
+stop() {
if [ -f /var/lock/subsys/nifd ]; then
- # Stop daemons.
msg_stopping nifd
killproc nifd
rm -f /var/lock/subsys/nifd
else
msg_not_running nifd
fi
+}
+
+condrestart() {
+ if [ -f /var/lock/subsys/nifd ]; then
+ stop
+ start
+ else
+ msg_not_running nifd
+ RETVAL=$1
+ fi
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
;;
restart)
- $0 stop
- $0 start
- exit $?
+ stop
+ start
+ ;;
+ try-restart)
+ condrestart 0
;;
- reload)
+ reload|force-reload)
if [ -f /var/lock/subsys/nifd ]; then
msg_reloading nifd
killproc nifd -HUP
@@ -67,21 +85,12 @@
RETVAL=7
fi
;;
- force-reload)
- # if program allows reloading without stopping
- $0 reload
-
- # or if it doesn't
- $0 restart
-
- exit $?
- ;;
status)
status nifd
RETVAL=$?
;;
*)
- msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+ msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|status}"
exit 3
esac
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/nifd.init?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
