X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-networking.sh;h=dd1d0f0c2007e746d7ed2024e57435055390c24e;hb=683095685ccdd4175b75293540aabe239d03a6bb;hp=dbdc9133431954f9059af52e38bc0b6838fa19bc;hpb=601865bed552e7018e56be921848e7703c594153;p=live-boot-grml.git

diff --git a/components/9990-networking.sh b/components/9990-networking.sh
index dbdc913..dd1d0f0 100755
--- a/components/9990-networking.sh
+++ b/components/9990-networking.sh
@@ -107,7 +107,7 @@ do_netsetup ()
 			# if configuration of device worked we should have an assigned
 			# IP address, if so let's use the device as $DEVICE for later usage.
 			# simple and primitive approach which seems to work fine
-			if ifconfig $dev | grep -q 'inet.*addr:'
+			if ifconfig $dev | grep -q -E 'inet.*addr:|inet [0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*'
 			then
 				export DEVICE="$dev"
 				break
@@ -151,7 +151,7 @@ do_netsetup ()
 				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
 			fi
 
-			for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
+			for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVERS}
 			do
 				if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
 				then