Index: initscript/fedora/avahi-dnsconfd.in =================================================================== --- initscript/fedora/avahi-dnsconfd.in (revision 1531) +++ initscript/fedora/avahi-dnsconfd.in (revision 1535) @@ -1,8 +1,8 @@ #! /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 \ @@ -14,18 +14,24 @@ # 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 +if [ $1 == 'status' ]; then + test -x $AVAHI_BIN || exit 4 +else + test -x $AVAHI_BIN || exit 5 +fi + 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=$? @@ -58,7 +64,6 @@ return $RETVAL } - restart() { stop start @@ -92,7 +97,7 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart}" - exit 1 + exit 2 ;; esac Index: initscript/fedora/avahi-daemon.in =================================================================== --- initscript/fedora/avahi-daemon.in (revision 1531) +++ initscript/fedora/avahi-daemon.in (revision 1535) @@ -2,7 +2,7 @@ # # avahi-daemon: Starts the Avahi Daemon # -# chkconfig: 345 97 02 +# chkconfig: 345 96 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. \ @@ -14,20 +14,24 @@ # Source function library. . /etc/init.d/functions - . /etc/sysconfig/network -# Check that networking is configured. -[ ${NETWORKING} = "no" ] && exit 0 - AVAHI_BIN=@sbindir@/avahi-daemon -test -x $AVAHI_BIN || exit 5 +if [ $1 == 'status' ]; then + test -x $AVAHI_BIN || exit 4 +else + test -x $AVAHI_BIN || exit 5 +fi + LOCKFILE=/var/lock/subsys/avahi-daemon base=${0##*/} start() { + # Check that networking is configured. + [ ${NETWORKING} = "no" ] && exit 1 + echo -n $"Starting Avahi daemon... " if [ -s /etc/localtime ]; then cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1 @@ -96,7 +100,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart}" - exit 1 + exit 2 + ;; esac exit $RETVAL