X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=avahi-autoipd-sbin_ip.patch;fp=avahi-autoipd-sbin_ip.patch;h=256d39a217e825533060b3395ed0be12a76629dc;hb=845bceb6a2d55acf04ca8f62204cc45e16428a23;hp=5ce63fed33ca2deb67aea114aefc2f4163e4bbc4;hpb=e3a440ad52483ad485dfca3c88360b2b166b5e43;p=packages%2Favahi.git

diff --git a/avahi-autoipd-sbin_ip.patch b/avahi-autoipd-sbin_ip.patch
index 5ce63fe..256d39a 100644
--- a/avahi-autoipd-sbin_ip.patch
+++ b/avahi-autoipd-sbin_ip.patch
@@ -1,8 +1,8 @@
---- avahi-0.6.25/avahi-autoipd/avahi-autoipd.action.linux.orig	2010-05-02 15:05:38.000000000 +0200
-+++ avahi-0.6.25/avahi-autoipd/avahi-autoipd.action.linux	2010-05-02 15:14:46.000000000 +0200
-@@ -30,17 +30,17 @@
- #   $2 interface name
- #   $3 IP adddress
+--- avahi-0.6.26/avahi-autoipd/avahi-autoipd.action.linux~	2010-06-25 20:50:59.000000000 +0200
++++ avahi-0.6.26/avahi-autoipd/avahi-autoipd.action.linux	2010-07-07 11:18:35.704019843 +0200
+@@ -35,19 +35,19 @@
+ 
+ METRIC=$((1000 + `cat "/sys/class/net/$2/ifindex" 2>/dev/null || echo 0`))
  
 -if [ -x /bin/ip -o -x /sbin/ip ] ; then
 +if [ -x /sbin/ip ] ; then
@@ -11,13 +11,17 @@
  
      case "$1" in
          BIND)
--            ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
-+            /sbin/ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
+-            ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
+-            ip route add default dev "$2" metric "$METRIC" scope link ||:
++            /sbin/ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
++            /sbin/ip route add default dev "$2" metric "$METRIC" scope link ||:
              ;;
  
          CONFLICT|UNBIND|STOP)
--            ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
-+            /sbin/ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
+-            ip route del default dev "$2" metric "$METRIC" scope link ||:
+-            ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
++            /sbin/ip route del default dev "$2" metric "$METRIC" scope link ||:
++            /sbin/ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
              ;;
  
          *)