fix avahi_netlink_new to allow multiple netlinks per process

[catta] / initscript / debian / avahi-dnsconfd.in

diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in
index c7cbf05fa804204013e2c1a636cef52fcd365a8e..67c28735bc6fe819a4822a1bbb868091cee41506 100755 (executable)
--- a/initscript/debian/avahi-dnsconfd.in
+++ b/initscript/debian/avahi-dnsconfd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -75,6 +73,16 @@ else
        return $1
     }
     
+    log_warning_msg () {
+       if log_use_fancy_output; then
+           YELLOW=`$TPUT setaf 3`
+           NORMAL=`$TPUT op`
+           echo "$YELLOW*$NORMAL $@"
+       else
+           echo "$@"
+       fi
+    }
+
 fi
 
 #set -e
@@ -83,10 +91,20 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DESC="Avahi Unicast DNS Configuration Daemon"
 NAME="avahi-dnsconfd"
 DAEMON="@sbindir@/$NAME"
+SCRIPTNAME=/etc/init.d/$NAME
 
 # Gracefully exit if the package has been removed.
 test -x $DAEMON || exit 0
 
+# don't start if /etc/default/avahi-dnsconfd says so.
+AVAHI_DNSCONFD_START=1
+test -f /etc/default/avahi-dnsconfd && . /etc/default/avahi-dnsconfd
+
+if [ "$AVAHI_DNSCONFD_START" != "1" -a "$1" != "stop" ]; then
+    log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME"
+    exit 0
+fi
+
 #
 #       Function that starts the daemon/service.
 #