A new user interface for you! Read more...

File 0.6.26-initscript.patch of Package avahi

diff --git a/initscript/fedora/Makefile.am b/initscript/fedora/Makefile.am
index e18f0f6..93a4138 100644
--- a/initscript/fedora/Makefile.am
+++ b/initscript/fedora/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -17,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-initddir = $(sysconfdir)/init.d
+initddir = $(sysconfdir)/rc.d/init.d
 
 EXTRA_DIST = avahi-daemon.in avahi-dnsconfd.in
 
@@ -26,9 +24,15 @@ initd_SCRIPTS = avahi-daemon avahi-dnsconfd
 CLEANFILES = avahi-daemon avahi-dnsconfd
 
 avahi-daemon: avahi-daemon.in
-	sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+	$(AM_V_GEN)sed \
+		-e 's,@sbindir\@,$(sbindir),g' \
+		-e 's,@localstatedir\@,$(localstatedir),g' \
+		$< > $@ && \
 	chmod +x $@
 
 avahi-dnsconfd: avahi-dnsconfd.in
-	sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+	$(AM_V_GEN)sed \
+		-e 's,@sbindir\@,$(sbindir),g' \
+		-e 's,@localstatedir\@,$(localstatedir),g' \
+		$< > $@ && \
 	chmod +x $@
diff --git a/initscript/fedora/avahi-daemon.in b/initscript/fedora/avahi-daemon.in
index c5b3230..5a8f430 100644
--- a/initscript/fedora/avahi-daemon.in
+++ b/initscript/fedora/avahi-daemon.in
@@ -1,16 +1,33 @@
-#! /bin/sh
+#!/bin/sh
 #
-# avahi-daemon:       Starts the Avahi Daemon
+# avahi-daemon: Starts the Avahi mDNS/DNS-SD Stack
 #
-# chkconfig: 345 24 02
-# description: This is a daemon which runs on client machines to perform \
-#              Zeroconf service discovery on a network. avahi-daemon must be \
-#              running on systems  that use Avahi for service discovery. \
-#              Avahi-daemon should not be running otherwise.
+# chkconfig:   345 24 02
+# description: This is a daemon which runs on client machines to \
+#              perform Zeroconf service discovery on a \
+#              network. avahi-daemon must be running on systems that \
+#              use Avahi for service discovery. Avahi-daemon should \
+#              not be running otherwise.
 # processname: avahi-daemon
-# config:
+# pidfile:     @localstatedir@/run/avahi-daemon/pid
+
+### BEGIN INIT INFO
+# Required-Start:    messagebus
+# Required-Stop:     messagebus
+# Should-Start:      $syslog $network $local_fs
+# Should-Stop:       $syslog $local_fs
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
+# Short-Description: Starts the Avahi Daemon
+# Description:       This is a daemon which runs on client machines to
+#                    perform Zeroconf service discovery on a
+#                    network. avahi-daemon must be running on systems
+#                    that use Avahi for service discovery.
+#                    Avahi-daemon should not be running otherwise.
+### END INIT INFO
 
 AVAHI_BIN=@sbindir@/avahi-daemon
+AVAHI_OPTS="-D"
 
 if [ "$1" = 'status' ]; then
     test -x $AVAHI_BIN || exit 4
@@ -18,13 +35,13 @@ else
     test -x $AVAHI_BIN || exit 5
 fi
 
-OTHER_AVAHI_OPTS=""
-
 # Source function library.
 . /etc/init.d/functions
 . /etc/sysconfig/network
 
-LOCKFILE=/var/lock/subsys/avahi-daemon
+LOCKFILE=@localstatedir@/lock/subsys/avahi-daemon
+PIDFILE=@localstatedir@/run/avahi-daemon/pid
+RETVAL=0
 
 base=${0##*/}
 
@@ -36,33 +53,26 @@ start() {
 	if [ -s /etc/localtime ]; then
 	    cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
 	fi;
-        $AVAHI_BIN -D
-	RETVAL=$?
-	if [ $RETVAL = 0 ]; then
-		touch $LOCKFILE
-		success $"$base startup"
-	else
-		failure $"$base startup"
-	fi
-	echo
+        daemon --pidfile=${PIDFILE} $AVAHI_BIN $AVAHI_OPTS
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && touch ${LOCKFILE}
 	return $RETVAL
 }
 
 stop() {
         echo -n $"Shutting down Avahi daemon: "
-        $AVAHI_BIN -k
-	RETVAL=$?
-	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
-	rm -f $LOCKFILE
-	echo
+        killproc -p ${PIDFILE} $AVAHI_BIN
+        RETVAL=$?
+        [ $RETVAL -eq 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+        echo
 	return $RETVAL
 }
 
 reload() {
         echo -n $"Reloading Avahi daemon... "
-        $AVAHI_BIN -r
+        killproc -p ${PIDFILE} $AVAHI_BIN -HUP
 	RETVAL=$?
-	[ $RETVAL = 0 ] && success $"$base reload" || failure $"$base reload"
 	echo
 	return $RETVAL
 }
@@ -83,9 +93,8 @@ case "$1" in
 	stop
 	;;
   status)
-        $AVAHI_BIN -c
-    	RETVAL=$?
-    	[ $RETVAL = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
+	status -p ${PIDFILE} $AVAHI_BIN
+        RETVAL=$?
 	;;
   restart)
 	restart
diff --git a/initscript/fedora/avahi-dnsconfd.in b/initscript/fedora/avahi-dnsconfd.in
index de49d7f..bd4182e 100644
--- a/initscript/fedora/avahi-dnsconfd.in
+++ b/initscript/fedora/avahi-dnsconfd.in
@@ -1,16 +1,33 @@
-#! /bin/sh
+#!/bin/sh
 #
-# avahi-dnsconfd:       Starts the Avahi dns configuration daemon
+# avahi-dnsconfd: Starts the Avahi DNS Configuration Daemon
 #
-# 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.
+# 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.
 # processname: avahi-dnsconfd
-# config:
+# pidfile:     @localstatedir@/run/avahi-dnsconfd.pid
+
+### BEGIN INIT INFO
+# Required-Start:    avahi-daemon
+# Required-Stop:     avahi-daemon
+# Should-Start:      $syslog $network $local_fs
+# Should-Stop:       $syslog $local_fs
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
+# Short-Description: Starts the Avahi DNS Configuration Daemon
+# 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.
+### END INIT INFO
 
 AVAHI_BIN=@sbindir@/avahi-dnsconfd
+AVAHI_OPTS="-D"
 
 if [ "$1" = 'status' ]; then
     test -x $AVAHI_BIN || exit 4
@@ -18,13 +35,13 @@ else
     test -x $AVAHI_BIN || exit 5
 fi
 
-OTHER_AVAHI_OPTS=""
-
 # Source function library.
 . /etc/init.d/functions
 . /etc/sysconfig/network
 
-LOCKFILE=/var/lock/subsys/avahi-dnsconfd
+LOCKFILE=@localstatedir@/lock/subsys/avahi-dnsconfd
+PIDFILE=@localstatedir@/run/avahi-dnsconfd.pid
+RETVAL=0
 
 base=${0##*/}
 
@@ -33,35 +50,28 @@ start() {
     [ ${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() {
@@ -80,9 +90,8 @@ 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