X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=avahi-dnsconfd;h=ce72ea4bd7f805b2a660a105803e5d61f9688a4e;hb=88f6455e6a8a2296bf07199b7972c9ffd6c3a9e8;hp=e08d3980c42124b12d47c003dbc286b334fb9485;hpb=cd2777bbdcc64c6481fcb3cf87cc284149b2f701;p=packages%2Favahi.git

diff --git a/avahi-dnsconfd b/avahi-dnsconfd
index e08d398..ce72ea4 100644
--- a/avahi-dnsconfd
+++ b/avahi-dnsconfd
@@ -2,13 +2,14 @@
 #
 # avahi-dnsconfd:	Starts the Avahi dns configuration daemon
 #
-# chkconfig:		345 34 66
+# chkconfig:		345 35 65
 #
 # description:	avahi-dnsconfd connects to a running avahi-daemon and runs the script \
 #		/etc/avahi/dnsconf.action for each unicast DNS server that is announced \
 #		on the local LAN. This is useful for configuring unicast DNS servers in \
 #		a DHCP-like fashion with mDNS.
 #
+# $Id$
 
 
 # Source function library
@@ -20,66 +21,87 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network ]; then
-		msg_network_down avahi-dnsconfd
+		msg_network_down "avahi-dnsconfd"
 		exit 1
 	fi
 else
 	exit 0
 fi
 
+start() {
+	# Check if the service is already running?
+	if [ -f /var/lock/subsys/avahi-dnsconfd ]; then
+		msg_already_running "avahi-dnsconfd"
+		return
+	fi
+
+	msg_starting "avahi-dnsconfd"
+	daemon /usr/sbin/avahi-dnsconfd -D
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/avahi-dnsconfd
+}
+
+stop() {
+	if [ ! -f /var/lock/subsys/avahi-dnsconfd ]; then
+		msg_not_running "avahi-dnsconfd"
+		return
+	fi
+
+	# Stop daemons.
+	msg_stopping "avahi-dnsconfd"
+	avahi-dnsconfd -k && ok || fail
+	rm -f /var/lock/subsys/avahi-dnsconfd
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/avahi-dnsconfd ]; then
+		msg_not_running "avahi-dnsconfd"
+		RETVAL=7
+		return
+	fi
+
+	msg_reloading "avahi-dnsconfd"
+	avahi-dnsconfd -r
+	RETVAL=$?
+}
+
+condrestart() {
+	if [ ! -f /var/lock/subsys/avahi-dnsconfd ]; then
+		msg_not_running "avahi-dnsconfd"
+		RETVAL=$1
+		return
+	fi
+
+	stop
+	start
+}
+
 
 # See how we were called.
 case "$1" in
   start)
-	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/avahi-dnsconfd ]; then
-		msg_starting avahi-dnsconfd
-		daemon --user avahi avahi-dnsconfd
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/avahi-dnsconfd
-	else
-		msg_already_running avahi-dnsconfd
-	fi
+  	start
 	;;
   stop)
-	if [ -f /var/lock/subsys/avahi-dnsconfd ]; then
-		# Stop daemons.
-		msg_stopping avahi-dnsconfd
-		killproc avahi-dnsconfd
-		rm -f /var/lock/subsys/avahi-dnsconfd
-	else
-		msg_not_running avahi-dnsconfd
-	fi
+  	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
-  reload)
-	if [ -f /var/lock/subsys/avahi-dnsconfd ]; then
-		msg_reloading avahi-dnsconfd
-		killproc avahi-dnsconfd -HUP
-		RETVAL=$?
-	else
-		msg_not_running avahi-dnsconfd >&2
-		RETVAL=7
-	fi
+  reload|force-reload)
+  	reload
 	;;
-  force-reload)
-	$0 reload
-	exit $?
+  try-restart)
+	condrestart 0
 	;;
   status)
 	status avahi-dnsconfd
 	RETVAL=$?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|reload|force-reload|try-restart|status}"
 	exit 3
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4