packages: howl/nifd.init - unify

[glen]

Author: glen                         Date: Tue Feb 28 06:54:43 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify

---- Files affected:
packages/howl:
   nifd.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/howl/nifd.init
diff -u packages/howl/nifd.init:1.3 packages/howl/nifd.init:1.4
--- packages/howl/nifd.init:1.3	Sun Jan 20 16:34:07 2008
+++ packages/howl/nifd.init	Tue Feb 28 07:54:38 2012
@@ -21,7 +21,7 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network ]; then
-		msg_network_down nifd
+		msg_network_down "nifd"
 		exit 1
 	fi
 else
@@ -31,33 +31,47 @@
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/nifd ]; then
-		msg_starting nifd
+		msg_starting "nifd"
 		daemon nifd
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nifd
 	else
-		msg_already_running nifd
+		msg_already_running "nifd"
 	fi
 }
 
 stop() {
-	if [ -f /var/lock/subsys/nifd ]; then
-		msg_stopping nifd
-		killproc nifd
-		rm -f /var/lock/subsys/nifd
-	else
-		msg_not_running nifd
+	if [ ! -f /var/lock/subsys/nifd ]; then
+		msg_not_running "nifd"
+		return
 	fi
+
+	msg_stopping "nifd"
+	killproc nifd
+	rm -f /var/lock/subsys/nifd
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/nifd ]; then
-		stop
-		start
-	else
-		msg_not_running nifd
+	if [ ! -f /var/lock/subsys/nifd ]; then
+		msg_not_running "nifd"
 		RETVAL=$1
+		return
+	fi
+
+	stop
+	start
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/nifd ]; then
+		msg_not_running "nifd"
+		RETVAL=7
+		return
 	fi
+
+	msg_reloading "nifd"
+	killproc nifd -HUP
+	RETVAL=$?
 }
 
 # See how we were called.
@@ -76,14 +90,7 @@
 	condrestart 0
 	;;
   reload|force-reload)
-	if [ -f /var/lock/subsys/nifd ]; then
-		msg_reloading nifd
-		killproc nifd -HUP
-		RETVAL=$?
-	else
-		msg_not_running nifd >&2
-		RETVAL=7
-	fi
+	reload
 	;;
   status)
 	status nifd
@@ -95,6 +102,3 @@
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/howl/nifd.init?r1=1.3&r2=1.4&f=u