X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Fnetwork%2Fconfig.sh;h=2c15b5e2313c91601c19291ec153e4e2aa7e94db;hb=a9d4da075e6de66dafa00cac0554bb48d38de053;hp=c5334cbd5d3e814699fd293679bc84da0f101af3;hpb=e24972ad73f1af720e162d4fd4611513cba7621e;p=openwrt.git

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index c5334cbd5d..2c15b5e231 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -13,7 +13,7 @@ find_config() {
 		esac
 		config_get device "$ifn" device
 		for ifc in $device $iface $ifaces; do
-			[ "$ifc" = "$1" ] && {
+			[ ."$ifc" = ."$1" ] && {
 				echo "$ifn"
 				return 0
 			}
@@ -74,9 +74,7 @@ prepare_interface() {
 	# if we're called for the bridge interface itself, don't bother trying
 	# to create any interfaces here. The scripts have already done that, otherwise
 	# the bridge interface wouldn't exist.
-	[ "$iface" = "br-$config" ] && return 0;
-
-	[ -f "$iface" ] && return 0;
+	[ "br-$config" = "$iface" -o -f "$iface" ] && return 0;
 	
 	ifconfig "$iface" 2>/dev/null >/dev/null && {
 		# make sure the interface is removed from any existing bridge and brought down
@@ -151,13 +149,14 @@ setup_interface() {
 			config_get dns "$config" dns
 			config_get bcast "$config" broadcast
 			
-			[ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask"
+			[ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
 			[ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
 			[ -z "$gateway" ] || $DEBUG route add default gw "$gateway"
-			[ -z "$bcast" ] || $DEBUG ifconfig "$iface" broadcast "$bcast"
-			[ -z "$dns" -o -f /tmp/resolv.conf.auto ] || {
+			[ -z "$dns" ] || {
 				for ns in $dns; do
-					echo "nameserver $ns" >> /tmp/resolv.conf.auto
+					grep "$ns" /tmp/resolv.conf.auto 2>/dev/null >/dev/null || {
+						echo "nameserver $ns" >> /tmp/resolv.conf.auto
+					}
 				done
 			}
 
@@ -181,7 +180,7 @@ setup_interface() {
 				$DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
 
 			# don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
-			[ "$proto1" != "$proto" ] && dhcpopts="-n -q"
+			[ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
 			$DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
 			lock -u "/var/lock/dhcp-$iface"
 		;;