* apply patches from debian pacakge

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

diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index f2ffcc3187de083eb83e4b9fd2168ab7f441301f..c99574faf0511b1234deb59165255a9a3e5beeca 100644 (file)
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -23,7 +23,7 @@
 [server]
 #host-name=foo
 #domain-name=local
-browse-domains=0pointer.de, zeroconf.org
+#browse-domains=0pointer.de, zeroconf.org
 use-ipv4=yes
 use-ipv6=no
 #check-response-ttl=no

diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in
index e942785a7e611d36f68c276aadef8e685a0100b5..3145f3aef0cb227ea554e99f0e935d8a230a195b 100755 (executable)
--- a/initscript/debian/avahi-daemon.in
+++ b/initscript/debian/avahi-daemon.in
@@ -91,6 +91,8 @@ test -x $DAEMON || exit 0
 #       Function that starts the daemon/service.
 #
 d_start() {
+    modprobe capability >/dev/null 2>&1 || true
+
     $DAEMON -c
     [ $? = 0 ] && exit 0
 
@@ -150,7 +152,7 @@ case "$1" in
         ;;
     restart|force-reload)
         log_begin_msg "Restarting $DESC: $NAME"
-        d_stop
+        $DAEMON -c && d_stop
         d_start
         log_end_msg $?
         ;;

diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in
index d100d177573a571a142ca8e0e7e97df50f28a838..c7cbf05fa804204013e2c1a636cef52fcd365a8e 100755 (executable)
--- a/initscript/debian/avahi-dnsconfd.in
+++ b/initscript/debian/avahi-dnsconfd.in
@@ -150,7 +150,7 @@ case "$1" in
         ;;
     reload|restart|force-reload)
         log_begin_msg "Restarting $DESC: $NAME"
-        d_stop
+        $DAEMON -c && d_stop
         d_start
         log_end_msg $?
         ;;