From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 21 Apr 2009 12:12:40 +0000 (+0000)
Subject: merge r14562 to 8.09 (closes: #4961)
X-Git-Tag: 8.09.1~101
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c8c205ee7395728140063c8384dc8858558ce3c8;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r14562 to 8.09 (closes: #4961)

SVN-Revision: 15324
---

diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 0eb044c512..198ef13c0f 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -14,12 +14,21 @@ hotplug_event() {
 		config_get proto $ifc proto
 		[ "$proto" = "dhcp" ] || continue
 		[ ifup = "$1" ] && {
+			config_get userdns "$ifc" dns
+			[ -n "$userdns" ] && {
+				for i in $userdns; do
+					echo "custom dns $i"
+					echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
+				done
+				dns="$userdns"
+			}
 			uci_set_state network "$ifc" ipaddr "$ip"
 			uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}"
 			uci_set_state network "$ifc" dnsdomain "$domain"
 			uci_set_state network "$ifc" dns "$dns"
 			uci_set_state network "$ifc" gateway "$router"
 		}
+		
 		env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
 	done
 }
@@ -45,16 +54,9 @@ case "$1" in
 			echo "deleting old routes"
 			$(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}')
 		}
-		
-		[ -n "$dns" ] && {
+
+		[ -n "$dns" ] && \
 			echo -n > "${RESOLV_CONF}.tmp"
-			${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
-			for i in $dns ; do
-				echo "adding dns $i"
-				echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
-			done
-			mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
-		}
 		
 		if [ "$1" = "renew" ]; then
 			hotplug_event update
@@ -62,6 +64,19 @@ case "$1" in
 			hotplug_event ifup
 		fi
 		
+		[ -n "$dns" ] && {
+			[ -s "${RESOLV_CONF}.tmp" ] || {
+				for i in $dns ; do
+					echo "adding dns $i"
+					echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
+				done
+			}
+
+			${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
+
+			mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
+		}
+		
 		# user rules
 		[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
 	;;