X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=initscript%2Ffedora%2Favahi-dnsconfd.in;h=df8b964a9927dac7b66fa346218f85face0eefef;hb=5f758a9a653821dc377ca4b97e2856dea11f5d0c;hp=6fde0baa299fdfd84de8c662b09ad0e9fa299e6d;hpb=672a9ae57083ba3022dad773e49792bc11c75e1c;p=catta

diff --git a/initscript/fedora/avahi-dnsconfd.in b/initscript/fedora/avahi-dnsconfd.in
index 6fde0ba..df8b964 100644
--- a/initscript/fedora/avahi-dnsconfd.in
+++ b/initscript/fedora/avahi-dnsconfd.in
@@ -1,64 +1,63 @@
-#! /bin/sh
+#!/bin/sh
 #
-# avahi-daemon:       Starts the Avahi dns configuration daemon
+# avahi-dnsconfd: Starts the Avahi dns configuration daemon
 #
-# chkconfig: - 97 02
+# chkconfig:   - 96 02
 # 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.
+#              /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.
 # processname: avahi-dnsconfd
-# config: 
+# pidfile:     @localstatedir@/run/avahi-dnsconfd.pid
 
-OTHER_AVAHI_OPTS=""
+AVAHI_BIN=@sbindir@/avahi-dnsconfd
+AVAHI_OPTS="-D"
+
+if [ "$1" = 'status' ]; then
+    test -x $AVAHI_BIN || exit 4
+else
+    test -x $AVAHI_BIN || exit 5
+fi
 
 # Source function library.
 . /etc/init.d/functions
-
 . /etc/sysconfig/network
 
-# Check that networking is configured.
-[ ${NETWORKING} = "no" ] && exit 0
-
-AVAHI_BIN=@sbindir@/avahi-dnsconfd
-test -x $AVAHI_BIN || exit 5
+LOCKFILE=@localstatedir@/lock/subsys/avahi-dnsconfd
+PIDFILE=@localstatedir@/run/avahi-dnsconfd.pid
+RETVAL=0
 
-LOCKFILE=/var/lock/subsys/avahi-dnsconfd
+base=${0##*/}
 
 start() {
+    # Check that networking is configured.
+    [ ${NETWORKING} = "no" ] && exit 1
+
 	echo -n $"Starting Avahi DNS daemon... "
-        $AVAHI_BIN -D
-	RETVAL=$?
-	if [ $RETVAL = 0 ]; then
-		touch $LOCKFILE
-		success $"$base startup"
-	else
-		failure $"$base startup"
-	fi
-	echo
-	return $RETVAL
+        daemon --pidfile=${PIDFILE} $AVAHI_BIN $AVAHI_OPTS
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && touch ${LOCKFILE}
+        return $RETVAL
 }
 
 stop() {
         echo -n $"Shutting down Avahi DNS daemon: "
-        $AVAHI_BIN -k
-	RETVAL=$?
-	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
-	rm -f $LOCKFILE
-	echo
-	return $RETVAL
+        killproc -p ${PIDFILE} $AVAHI_BIN
+        RETVAL=$?
+        [ $RETVAL -eq 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+        echo
+        return $RETVAL
 }
 
 reload() {
         echo -n $"Reloading Avahi DNS daemon... "
-        $AVAHI_BIN -r
-	RETVAL=$?
-	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
-	echo
-	return $RETVAL
+        killproc -p ${PIDFILE} $AVAHI_BIN -HUP
+        RETVAL=$?
+        echo
+        return $RETVAL
 }
 
-
 restart() {
 	stop
 	start
@@ -75,15 +74,14 @@ case "$1" in
 	stop
 	;;
   status)
-        $AVAHI_BIN -c
+        status -p ${PIDFILE} $AVAHI_BIN
         RETVAL=$?
-        [ $RETVAL = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
 	;;
   restart)
 	restart
 	;;
   reload)
-        reload 
+        reload
 	;;
   condrestart)
   	if [ -f $LOCKFILE ]; then
@@ -92,9 +90,8 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-	exit 1
+	exit 2
 	;;
 esac
 
 exit $RETVAL
-