X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flive-bottom%2F23networking;h=429a135dc4e56407571ca02e11ca2fb86149ae52;hb=bf5db2437a64882e205529760186f37b02716f5d;hp=603116fe0c353a5d4de69eb880db8f7695224e31;hpb=cc62ca76356dc851006e3fc980cc1dcc46ef9ca6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 603116f..429a135 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -46,7 +46,7 @@ iface lo inet loopback
 
 EOF
 
-udevtrigger
+udevadm trigger
 udevsettle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
@@ -98,22 +98,24 @@ EOF
 		done
 	fi
 
-	if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ]
+	if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ]
 	then
-		# create a resolv.conf if it is not present
-		cp /netboot.config /root/var/log/netboot.config
+		if [ -f /netboot.config ]
+		then
+			# create a resolv.conf if it is not present or empty
+			cp /netboot.config /root/var/log/netboot.config
 
-		rc_search=$(cat netboot.config | awk '/domain/{print $3}')
-		rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
-		rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
-		rc_server0="nameserver ${rc_server0}"
+			rc_search=$(cat netboot.config | awk '/domain/{print $3}')
+			rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
+			rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
+			rc_server0="nameserver ${rc_server0}"
 
-		if [ "${rc_server1}" = "0.0.0.0" ]
-		then
-			rc_server1=""
-		else
-			rc_server1="nameserver ${rc_server1}"
-		fi
+			if [ "${rc_server1}" = "0.0.0.0" ]
+			then
+				rc_server1=""
+			else
+				rc_server1="nameserver ${rc_server1}"
+			fi
 
 cat > /root/etc/resolv.conf << EOF
 # /etc/resolv.conf
@@ -124,7 +126,8 @@ ${rc_server0}
 ${rc_server1}
 EOF
 
-		cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+			cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+		fi
 	fi
 fi