From 3f8227311e734f408e34d114be975f400b20c989 Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Fri, 17 Feb 2006 01:03:46 +0000 Subject: * apply patches from debian pacakge git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1145 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-daemon/avahi-daemon.conf | 2 +- initscript/debian/avahi-daemon.in | 4 +++- initscript/debian/avahi-dnsconfd.in | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf index f2ffcc3..c99574f 100644 --- 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 e942785..3145f3a 100755 --- 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 d100d17..c7cbf05 100755 --- 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 $? ;; -- cgit