[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-19-g2656ab7

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 2656ab78ef376122cdb916205c99979d8554b688
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Jun 18 10:08:01 2011 -0700

    rfc3442-classless-routes hook use iproute
    
    Related to #630519

diff --git a/debian/changelog b/debian/changelog
index f11dbfe..97321b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 isc-dhcp (4.1.1-P1-18) unstable; urgency=low
 
   * debian/control: fix short description for dhcp3-client package
+  * debian/rfc3442-classless-routes: convert to using iproute (closes: #630519)
 
- -- Andrew Pollock <apollock at debian.org>  Fri, 10 Jun 2011 08:25:18 -0700
+ -- Andrew Pollock <apollock at debian.org>  Sat, 18 Jun 2011 10:07:16 -0700
 
 isc-dhcp (4.1.1-P1-17) unstable; urgency=low
 
diff --git a/debian/rfc3442-classless-routes b/debian/rfc3442-classless-routes
index 6e14946..e70db30 100644
--- a/debian/rfc3442-classless-routes
+++ b/debian/rfc3442-classless-routes
@@ -49,9 +49,9 @@ if [ "$RUN" = "yes" ]; then
 				esac
 
 				if [ "$net_length" -eq 32 ]; then
-					/sbin/route add -host "${net_address}" gw "${gateway}"
+					ip -4 route add "${net_address}" via "${gateway}"
 				else
-					/sbin/route add -net "${net_address}/${net_length}" gw "${gateway}"
+					ip -4 route add "${net_address}/${net_length}" via "${gateway}"
 				fi
 			done
 		fi

-- 
ISC DHCP packaging for Debian