packages: bind/named.init - unify, add try-restart

[glen]

Author: glen                         Date: Fri Jul  8 16:22:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify, add try-restart

---- Files affected:
packages/bind:
   named.init (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: packages/bind/named.init
diff -u packages/bind/named.init:1.41 packages/bind/named.init:1.42
--- packages/bind/named.init:1.41	Tue Jul  6 10:36:33 2010
+++ packages/bind/named.init	Fri Jul  8 18:22:47 2011
@@ -38,29 +38,58 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/named ]; then
-		msg_starting "Named"
-		modprobe -s capability > /dev/null 2>&1
-		[ -f /etc/localtime ] && cp -puL /etc/localtime $CHROOT_TO_DIR/etc/localtime
-		touch $CHROOT_TO_DIR/named.log && \
-			chown named:named $CHROOT_TO_DIR/named.log
-		daemon --pidfile $CHROOT_TO_DIR/named.pid /usr/sbin/named -u named \
-			-t $CHROOT_TO_DIR -c /etc/named.conf $NAMED_OPT </dev/null
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
-	else
+	if [ -f /var/lock/subsys/named ]; then
 		msg_already_running "Named"
+		return
 	fi
+
+	msg_starting "Named"
+	modprobe -s capability > /dev/null 2>&1
+	[ -f /etc/localtime ] && cp -puL /etc/localtime $CHROOT_TO_DIR/etc/localtime
+	touch $CHROOT_TO_DIR/named.log && \
+		chown named:named $CHROOT_TO_DIR/named.log
+	daemon --pidfile $CHROOT_TO_DIR/named.pid /usr/sbin/named -u named \
+		-t $CHROOT_TO_DIR -c /etc/named.conf $NAMED_OPT </dev/null
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
 }
 
 stop() {
-	if [ -f /var/lock/subsys/named ]; then
-		msg_stopping "Named"
-		killproc --pidfile $CHROOT_TO_DIR/named.pid named
-		rm -f /var/lock/subsys/named >/dev/null 2>&1
+	if [ ! -f /var/lock/subsys/named ]; then
+		msg_not_running "Named"
+		return
+	fi
+
+	msg_stopping "Named"
+	killproc --pidfile $CHROOT_TO_DIR/named.pid named
+	rm -f /var/lock/subsys/named >/dev/null 2>&1
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/named ]; then
+		msg_not_running "Named"
+		RETVAL=7
+		return
+	fi
+
+	if [ -f /etc/rndc.conf ]; then
+		run_cmd "$(nls 'Reloading %s service' 'Named')" /usr/sbin/rndc reload
 	else
+		msg_reloading "Named"
+		killproc named -HUP
+		RETVAL=$?
+	fi
+}
+
+condrestart() {
+	if [ ! -f /var/lock/subsys/named ]; then
 		msg_not_running "Named"
+		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
@@ -72,6 +101,16 @@
   stop)
 	stop
 	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  reload|force-reload)
+	reload
+	;;
   status)
 	status named
 	RETVAL=$?
@@ -83,27 +122,8 @@
 		fi
 	fi
 	;;
-  reload|force-reload)
-	if [ -f /var/lock/subsys/named ]; then
-		if [ -f /etc/rndc.conf ]; then
-			run_cmd "$(nls 'Reloading %s service' 'Named')" /usr/sbin/rndc reload
-		else
-			msg_reloading "Named"
-			killproc named -HUP
-			RETVAL=$?
-		fi
-	else
-		msg_not_running "Named"
-		exit 7
-	fi
-
-	;;
-  restart)
-	stop
-	start
-	;;
   *)
-	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/packages/bind/named.init?r1=1.41&r2=1.42&f=u