Make init scripts fail faster; patch from scop

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1757 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/initscript/fedora/avahi-daemon.in b/initscript/fedora/avahi-daemon.in
index 69fac9bad1901bdb05df1df2ab618f099780389e..d30986652d88ae6f0fb268d287c06bcb936cdb75 100644 (file)
--- a/initscript/fedora/avahi-daemon.in
+++ b/initscript/fedora/avahi-daemon.in
@@ -10,12 +10,6 @@
 # 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,6 +18,12 @@ 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
 
 base=${0##*/}

diff --git a/initscript/fedora/avahi-dnsconfd.in b/initscript/fedora/avahi-dnsconfd.in
index a29cf1a156c2022e591ad151695f8c0d38e600c6..284c10bf8d62d568eaa842b18680735ebb0fb8c7 100644 (file)
--- a/initscript/fedora/avahi-dnsconfd.in
+++ b/initscript/fedora/avahi-dnsconfd.in
@@ -10,12 +10,6 @@
 # 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,6 +18,12 @@ 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
 
 base=${0##*/}

diff --git a/initscript/mandriva/avahi-daemon.in b/initscript/mandriva/avahi-daemon.in
index 2efbc6e9a40c51d1dad42553c147d0bb5b0715e7..f285d3be39ff15405e8f9530d57cb71d9f9ef240 100644 (file)
--- a/initscript/mandriva/avahi-daemon.in
+++ b/initscript/mandriva/avahi-daemon.in
@@ -8,6 +8,9 @@
 # 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,9 +19,6 @@
 # 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

diff --git a/initscript/mandriva/avahi-dnsconfd.in b/initscript/mandriva/avahi-dnsconfd.in
index 3e8aaafae326c918f06c7a42fa666bba1ba8c45f..a221356fb6fbd87ac88be4ce53a157adb00a0b99 100644 (file)
--- a/initscript/mandriva/avahi-dnsconfd.in
+++ b/initscript/mandriva/avahi-dnsconfd.in
@@ -8,6 +8,9 @@
 # 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,9 +19,6 @@
 # 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