Ticket #199: avahi-init-failfast.patch

initscript/fedora/avahi-dnsconfd.in

@@ -10 +10 @@
 # processname: avahi-dnsconfd
 # config:
 
-OTHER_AVAHI_OPTS=""
-
-# Source function library.
-. /etc/init.d/functions
-. /etc/sysconfig/network
-
 AVAHI_BIN=@sbindir@/avahi-dnsconfd
 
 if [ "$1" == 'status' ]; then
@@ -24 +18 @@
     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
 
 base=${0##*/}

initscript/fedora/avahi-daemon.in

@@ -10 +10 @@
 # processname: avahi-daemon
 # config: 
 
-OTHER_AVAHI_OPTS=""
-
-# Source function library.
-. /etc/init.d/functions
-. /etc/sysconfig/network
-
 AVAHI_BIN=@sbindir@/avahi-daemon
 
 if [ "$1" == 'status' ]; then
@@ -24 +18 @@
     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
 
 base=${0##*/}

initscript/mandriva/avahi-dnsconfd.in

@@ -8 +8 @@
 # Description: A DNS configuration daemon using mDNS in a DHCP-like fashion
 ### END INIT INFO
 
+AVAHI_BIN=@sbindir@/avahi-dnsconfd
+test -x $AVAHI_BIN || exit 5
+
 # Source function library.
 . /etc/init.d/functions
 
@@ -16 +19 @@
 # Check that networking is configured.
 [ ${NETWORKING} = "no" ] && exit 0
 
-AVAHI_BIN=@sbindir@/avahi-dnsconfd
-test -x $AVAHI_BIN || exit 5
-
 start() {
     echo -n $"Starting Avahi DNS daemon: "
     $AVAHI_BIN -D

initscript/mandriva/avahi-daemon.in

@@ -8 +8 @@
 # Description: Avahi, a ZeroConf daemon whichs implements an mDNS stack 
 ### END INIT INFO
 
+AVAHI_BIN=@sbindir@/avahi-daemon
+test -x $AVAHI_BIN || exit 5
+
 # Source function library.
 . /etc/init.d/functions
 
@@ -16 +19 @@
 # Check that networking is configured.
 [ ${NETWORKING} = "no" ] && exit 0
 
-AVAHI_BIN=@sbindir@/avahi-daemon
-test -x $AVAHI_BIN || exit 5
-
 start() {
     echo -n $"Starting Avahi daemon: "
     $AVAHI_BIN -D