From 8f106ca9eb014411a4276dd0ab87efce8921e332 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 6 Sep 2007 16:57:42 +0000 Subject: [PATCH] move fedora init script to level 96, closing rhbz #249044 git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1534 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- initscript/fedora/avahi-daemon.in | 4 ++-- initscript/fedora/avahi-dnsconfd.in | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/initscript/fedora/avahi-daemon.in b/initscript/fedora/avahi-daemon.in index 46318cf..f267577 100644 --- a/initscript/fedora/avahi-daemon.in +++ b/initscript/fedora/avahi-daemon.in @@ -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. \ @@ -16,7 +16,6 @@ OTHER_AVAHI_OPTS="" . /etc/init.d/functions . /etc/sysconfig/network - AVAHI_BIN=@sbindir@/avahi-daemon if [ $1 == 'status' ]; then @@ -102,6 +101,7 @@ case "$1" in *) echo $"Usage: $0 {start|stop|status|restart|condrestart}" exit 2 + ;; esac exit $RETVAL diff --git a/initscript/fedora/avahi-dnsconfd.in b/initscript/fedora/avahi-dnsconfd.in index a86bea8..4b96e94 100644 --- a/initscript/fedora/avahi-dnsconfd.in +++ b/initscript/fedora/avahi-dnsconfd.in @@ -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 \ @@ -17,6 +17,7 @@ OTHER_AVAHI_OPTS="" . /etc/sysconfig/network AVAHI_BIN=@sbindir@/avahi-dnsconfd + if [ $1 == 'status' ]; then test -x $AVAHI_BIN || exit 4 else @@ -25,6 +26,8 @@ fi LOCKFILE=/var/lock/subsys/avahi-dnsconfd +base=${0##*/} + start() { # Check that networking is configured. [ ${NETWORKING} = "no" ] && exit 1 @@ -61,7 +64,6 @@ reload() { return $RETVAL } - restart() { stop start -- 2.39.5