[Pkg-utopia-commits] r3267 - in /packages/unstable/avahi/debian: avahi-daemon-check-dns.sh avahi-daemon.if-up changelog

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Nov 22 22:45:43 2009
New Revision: 3267

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3267
Log:
* debian/avahi-daemon-check-dns.sh
  + Also check for a default route before checking the DNS

Modified:
    packages/unstable/avahi/debian/avahi-daemon-check-dns.sh
    packages/unstable/avahi/debian/avahi-daemon.if-up
    packages/unstable/avahi/debian/changelog

Modified: packages/unstable/avahi/debian/avahi-daemon-check-dns.sh
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-daemon-check-dns.sh?rev=3267&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-daemon-check-dns.sh (original)
+++ packages/unstable/avahi/debian/avahi-daemon-check-dns.sh Sun Nov 22 22:45:43 2009
@@ -35,7 +35,9 @@
     ADDRS=$(LC_ALL=C ifconfig | grep ' addr:')
     # Filter out all local addresses
     ADDRS=$(echo "${ADDRS}" | egrep -v ':127|Scope:Host|Scope:Link')
-    if [ -z "${ADDRS}" ] ; then
+    # Check we have a default route
+    ROUTES=$(route -n | grep '^0.0.0.0 ')
+    if [ -z "${ADDRS}" -o -z "${ROUTES}" ] ; then
       return 1;
     fi
   fi

Modified: packages/unstable/avahi/debian/avahi-daemon.if-up
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/avahi-daemon.if-up?rev=3267&op=diff
==============================================================================
--- packages/unstable/avahi/debian/avahi-daemon.if-up (original)
+++ packages/unstable/avahi/debian/avahi-daemon.if-up Sun Nov 22 22:45:43 2009
@@ -5,9 +5,6 @@
 # device
 [ "$IFACE" != "lo" ] || exit 0
 
-# Bail out if resolvconf is installed
-[ -x /sbin/resolvconf ] && exit 0
-
 # If we have an unicast .local domain, we immediately disable avahi to avoid
 # conflicts with the multicast IP4LL .local domain
 if [ -x /usr/lib/avahi/avahi-daemon-check-dns.sh ] ; then

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=3267&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Sun Nov 22 22:45:43 2009
@@ -1,11 +1,16 @@
 avahi (0.6.25-2) UNRELEASED; urgency=low
 
+  [ Michael Biebl ]
   * patches/15-manpage-typo-fixes.patch
     - Fix a few typos in the man pages (s/seperated/separated/).
       (Closes: #525268)
       Thanks to A. Costa for the patch.
 
- -- Michael Biebl <biebl at debian.org>  Sat, 18 Apr 2009 14:52:48 +0200
+  [ Sjoerd Simons ]
+  * debian/avahi-daemon-check-dns.sh
+    + Also check for a default route before checking the DNS
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 22 Nov 2009 22:44:42 +0000
 
 avahi (0.6.25-1) unstable; urgency=low