packages: howl/mDNSResponder-howl.init - unify

[glen]

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

---- Files affected:
packages/howl:
   mDNSResponder-howl.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/howl/mDNSResponder-howl.init
diff -u packages/howl/mDNSResponder-howl.init:1.1 packages/howl/mDNSResponder-howl.init:1.2
--- packages/howl/mDNSResponder-howl.init:1.1	Sat May 20 21:49:28 2006
+++ packages/howl/mDNSResponder-howl.init	Tue Feb 28 07:51:03 2012
@@ -20,60 +20,64 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network ]; then
-		msg_network_down mDNSResponder
+		msg_network_down "mDNSResponder"
 		exit 1
 	fi
 else
 	exit 0
 fi
 
+start() {
+	# Check if the service is already running?
+	if [ -f /var/lock/subsys/mDNSResponder ]; then
+		msg_already_running "mDNSResponder"
+		return
+	fi
+
+	msg_starting "mDNSResponder"
+	daemon --user nobody mDNSResponder
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mDNSResponder
+}
+
+stop() {
+	if [ ! -f /var/lock/subsys/mDNSResponder ]; then
+		msg_not_running "mDNSResponder"
+		return
+	fi
+
+	# Stop daemons.
+	msg_stopping "mDNSResponder"
+	killproc mDNSResponder
+	rm -f /var/lock/subsys/mDNSResponder
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/mDNSResponder ]; then
+		msg_not_running "mDNSResponder"
+		RETVAL=7
+		return
+	fi
+
+	msg_reloading "mDNSResponder"
+	killproc mDNSResponder -HUP
+	RETVAL=$?
+}
 
 # See how we were called.
 case "$1" in
   start)
-	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/mDNSResponder ]; then
-		msg_starting mDNSResponder
-		daemon --user nobody mDNSResponder
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mDNSResponder
-	else
-		msg_already_running mDNSResponder
-	fi
+	start
 	;;
   stop)
-	if [ -f /var/lock/subsys/mDNSResponder ]; then
-		# Stop daemons.
-		msg_stopping mDNSResponder
-		killproc mDNSResponder
-		rm -f /var/lock/subsys/mDNSResponder
-	else
-		msg_not_running mDNSResponder
-	fi
+	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
-  reload)
-	if [ -f /var/lock/subsys/mDNSResponder ]; then
-		msg_reloading mDNSResponder
-		killproc mDNSResponder -HUP
-		RETVAL=$?
-	else
-		msg_not_running mDNSResponder >&2
-		RETVAL=7
-	fi
-	;;
-  force-reload)
-	# if program allows reloading without stopping
-	$0 reload
-
-	# or if it doesn't
-	$0 restart
-
-	exit $?
+  reload|force-reload)
+	reload
 	;;
   status)
 	status mDNSResponder
@@ -85,6 +89,3 @@
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh
================================================================

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