summaryrefslogtreecommitdiff
blob: 7b8163be0f2ea545b45900e2a9e86568730c1f73 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
--- lib/rcscripts/net.modules.d/helpers.d/udhcpc-ifconfig	(revision 1866)
+++ net.modules.d/helpers.d/udhcpc-ifconfig	(working copy)
@@ -37,7 +37,7 @@
 
 # If the current address does not match or we are deconfiguring
 # then we take the all the addresses on the interface down
-cur=$( ifconfig ${interface} | grep 'inet ' | awk -F: '{ print $2,$3 }' | awk '{ print $1,$3 }' )
+cur=$( ifconfig ${interface} | grep 'inet ' | awk -F: '{ print $2,$4 }' | awk '{ print $1,$3 }' )
 if [[ ${cur} != "${ip} ${subnet}" || ${action} == deconfig ]]; then
 	# Remove all aliases
 	for i in $( ifconfig | grep -o "^${interface}:[0-9]*" | tac | xargs ); do
@@ -68,7 +68,7 @@
     # Configure our routers
     for r in ${router}; do
 	while true; do
-	    /sbin/route del 0.0.0.0 2>/dev/null || break
+	    /sbin/route del default 2>/dev/null || break
 	done
 
 	# We can only have one default route!
--- etc/init.d/net.lo	(revision 1908)
+++ init.d/net.lo	(working copy)
@@ -19,7 +19,7 @@
 # For pcmcia users. note that pcmcia must be added to the same
 # runlevel as the net.* script that needs it.
 depend() {
-	use coldplug hotplug pcmcia usb isdn wlan
+	use coldplug hotplug pcmcia usb isdn wlan isapnp
 
 	# Load any custom depend functions for the given interface
 	# For example, br0 may need eth0 and eth1