[Pkg-utopia-commits] r1081 - in packages/unstable/avahi/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-10-20 07:46:58 +0000 (Fri, 20 Oct 2006)
New Revision: 1081

Added:
   packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch
Modified:
   packages/unstable/avahi/debian/avahi-autoipd.ifdown
   packages/unstable/avahi/debian/avahi-autoipd.ifup
   packages/unstable/avahi/debian/changelog
Log:
* improved route-addition


Modified: packages/unstable/avahi/debian/avahi-autoipd.ifdown
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.ifdown	2006-10-20 07:37:16 UTC (rev 1080)
+++ packages/unstable/avahi/debian/avahi-autoipd.ifdown	2006-10-20 07:46:58 UTC (rev 1081)
@@ -17,12 +17,10 @@
 	[ "`ip route show dev $IFACE | grep ^169.254.0.0/16`" ] || exit 0
 
 	/bin/ip route del 169.254.0.0/16 dev $IFACE metric 1000 scope link || true
-	/bin/ip route del default dev $IFACE metric 1000 scope link || true
 elif [ -x /sbin/route ]; then
 	# route already present?
 	[ "`/sbin/route -n | grep ^169.254.0.0 | grep $IFACE`" ] || exit 0
 
 	/sbin/route del -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000 || true
-	/sbin/route del default dev $IFACE metric 1000 || true
 fi
 

Modified: packages/unstable/avahi/debian/avahi-autoipd.ifup
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.ifup	2006-10-20 07:37:16 UTC (rev 1080)
+++ packages/unstable/avahi/debian/avahi-autoipd.ifup	2006-10-20 07:46:58 UTC (rev 1081)
@@ -16,12 +16,10 @@
 	[ "`ip route show dev $IFACE | grep ^169.254.0.0/16`" ] && exit 0
 
 	/bin/ip route add 169.254.0.0/16 dev $IFACE metric 1000 scope link
-	/bin/ip route add default dev $IFACE metric 1000 scope link
 elif [ -x /sbin/route ]; then
 	# route already present?
 	[ "`/sbin/route -n | grep ^169.254.0.0 | grep $IFACE`" ] && exit 0
 
 	/sbin/route add -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000
-	/sbin/route add default dev $IFACE metric 1000
 fi
 

Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-10-20 07:37:16 UTC (rev 1080)
+++ packages/unstable/avahi/debian/changelog	2006-10-20 07:46:58 UTC (rev 1081)
@@ -18,7 +18,8 @@
     + Add the netdev group unless it's already there (Closes: #385495, #389243)
   * debian/avahi-autoipd.ifup,
     debian/avahi-autoipd.ifdown,
-    debian/rules:
+    debian/rules,
+    debian/patches/11_avahi-autoipd.action-add-routes.patch:
     + Add ifupdown scripts to set routes to allow communication between
       machines which only have an IPv4LL address assigned and those which
       only have a routable address assigned.

Added: packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch
===================================================================
--- packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch	                        (rev 0)
+++ packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch	2006-10-20 07:46:58 UTC (rev 1081)
@@ -0,0 +1,30 @@
+--- avahi-autoipd/avahi-autoipd.action.old	2006-10-20 09:42:33.732375000 +0200
++++ avahi-autoipd/avahi-autoipd.action	2006-10-20 09:44:35.003954000 +0200
+@@ -36,11 +36,13 @@
+ 
+     case "$1" in
+         BIND)
+-            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 1000 scope link || true
+             ;;
+ 
+         CONFLICT|UNBIND|STOP)
+             ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
++	    ip route del default dev "$2" metric 1000 scope link || true
+             ;;
+ 
+         *)
+@@ -56,10 +58,12 @@
+     case "$1" in
+         BIND)
+             ifconfig "$2:3" inet "$3" netmask 255.255.0.0 broadcast 169.254.255.255 up
++            route add default dev "$3" metric 1000 || true
+             ;;
+ 
+         CONFLICT|STOP|UNBIND)
+             ifconfig "$2:3" down
++            route del default dev "$3" metric 1000 || true
+             ;;
+ 
+         *)