X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8ae4dfd85cad1616177d1732604cc98e6decf8a0..835a68409cb230cccd703fe8e5ffcba3a1096c8e:/package/base-files/files/usr/share/udhcpc/default.script

diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 1b02c0c18..92e3474bd 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -11,11 +11,6 @@ change_state () {
 	uci_set_state "$1" "$2" "$3" "$4"
 }
 
-uci_get() {
-	[ -n "$ifc" ] || return
-	uci -P /dev/null get "$1" 2>/dev/null
-}
-
 setup_interface () {
 	local old_ip
 	local old_broadcast
@@ -26,9 +21,9 @@ setup_interface () {
 	local user_router
 
 	[ -n "$ifc" ] && {
-		config_get old_ip        "$ifc" ipaddr
-		config_get old_broadcast "$ifc" broadcast
-		config_get old_subnet    "$ifc" netmask
+		old_ip="$(uci_get_state network "$ifc" ipaddr)"
+		old_broadcast="$(uci_get_state network "$ifc" broadcast)"
+		old_subnet="$(uci_get_state network "$ifc" netmask)"
 	}
 
 	[ "$ip" != "$old_ip" ] \
@@ -144,21 +139,21 @@ setup_interface () {
 	}
 
 	# DNS
-	config_get old_dns "$ifc" dns
+	old_dns=$(uci_get_state network "$ifc" dns)
+	old_domain=$(uci_get_state network "$ifc" dnsdomain)
 	user_dns=$(uci_get "network.$ifc.dns")
 	[ -n "$user_dns" ] && dns="$user_dns"
 
-	[ -n "$dns" ] && [ ! -s "${RESOLV_CONF}" -o "$dns" != "$old_dns" ] && {
+	[ -n "$dns" ] && [ "$dns" != "$old_dns" -o -n "$user_dns" ] && {
 		echo "udhcpc: setting dns servers: $dns"
-		echo -n > "${RESOLV_CONF}.tmp"
-		for i in $dns ; do
-			echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
-		done
-		${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
-		mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
-
-		change_state network "$ifc" dnsdomain "$domain"
-		change_state network "$ifc" dns "$dns"
+		add_dns "$ifc" $dns
+
+		[ -n "$domain" ] && [ "$domain" != "$old_domain" ] && {
+			echo "udhcpc: setting dns domain: $domain"
+			sed -i -e "${old_domain:+/^search $old_domain$/d; }/^search $domain$/d" "${RESOLV_CONF}"
+			echo "search $domain" >> "${RESOLV_CONF}"
+			change_state network "$ifc" dnsdomain "$domain"
+		}
 	}
 
 	[ -n "$ifc" ] || return
@@ -215,9 +210,9 @@ for ifc in $interfaces __default; do
 			setup_interface ifup
 		;;
 	esac
-
-	# user rules
-	[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
 done
 
+# user rules
+[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
+
 exit 0