X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ba3ea46d528d1655a8dd1739b7de0eac65a29ec5..841e5a0f16d54f9548f83f30c8b4efd736a3af12:/package/base-files/default/usr/share/udhcpc/default.script

diff --git a/package/base-files/default/usr/share/udhcpc/default.script b/package/base-files/default/usr/share/udhcpc/default.script
index 0c08985e7..42d3eaf0c 100755
--- a/package/base-files/default/usr/share/udhcpc/default.script
+++ b/package/base-files/default/usr/share/udhcpc/default.script
@@ -1,42 +1,54 @@
 #!/bin/sh
-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
-# (slightly modified for OpenWrt)
-
 [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
 
 RESOLV_CONF="/tmp/resolv.conf"
 
-case "$1" in
-        deconfig)
-                ifconfig $interface 0.0.0.0
-                ;;
-
-        renew|bound)
-                ifconfig $interface $ip \
-                netmask ${subnet:-255.255.255.0} \
-                broadcast ${broadcast:-+}
-
-                if [ -n "$router" ] ; then
-                        echo "deleting routers"
-                        while route del default gw 0.0.0.0 dev $interface ; do
-                                :
-                        done
-
-                        for i in $router ; do
-                                route add default gw $i dev $interface
-                        done
-                fi
-
-                echo -n > $RESOLV_CONF
-                ${domain:+echo search $domain} >> $RESOLV_CONF
-                for i in $dns ; do
-                        echo adding dns $i
-                        echo nameserver $i >> $RESOLV_CONF
+hotplug_event() {
+	nvram show 2>&- | grep _proto=dhcp | {
+		while :; do
+			read FOO
+			[ -z "$FOO" ] && break
+			FOO="${FOO%%_*}"
+			[ "$(nvram get ${FOO}_ifname)" = "${interface}" ] || continue
+			env -i ACTION="$1" INTERFACE="${FOO}" PROTO=dhcp /sbin/hotplug iface
+		done
+	}
+}
 
+case "$1" in
+	deconfig)
+		ifconfig $interface 0.0.0.0
+		hotplug_event ifdown
+	;;
+	renew|bound)
+		ifconfig $interface $ip \
+		netmask ${subnet:-255.255.255.0} \
+		broadcast ${broadcast:-+}
+
+		if [ -n "$router" ] ; then
+
+			if [ "$router" != "$(route -n | grep '^0.0.0.0' | grep $interface | awk '{ print $2 }')" ] ; then
+				while route del default gw 0.0.0.0 dev $interface 2>&- ; do
+					echo "removing old default route"
+				done				
+				for i in $router ; do
+					route add default gw $i dev $interface
+				done
+			fi
+		fi
+
+		echo -n > $RESOLV_CONF
+		${domain:+echo search $domain} >> $RESOLV_CONF
+		for i in $dns ; do
+			echo adding dns $i
+			echo nameserver $i >> $RESOLV_CONF
+		done
+		
+		hotplug_event ifup
+		
 		# user rules
 		[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
-
-                done
-                ;;
+	;;
 esac
+
 exit 0