X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=5e9afe94c85ba670685e57292ac63090ca8190d8;hb=97a04033aa1534bd62aa0bbf4e83c79c9827f1ec;hp=603116fe0c353a5d4de69eb880db8f7695224e31;hpb=658c0f1514abe8176d76897c61cad8e0ba8ed610;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 603116f..5e9afe9 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -46,8 +46,16 @@ iface lo inet loopback
 
 EOF
 
-udevtrigger
-udevsettle
+if [ -x /sbin/udevadm ]
+then
+	# lenny
+	udevadm trigger
+	udevadm settle
+else
+	# etch
+	udevtrigger
+	udevsettle
+fi
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
 then
@@ -98,22 +106,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 +134,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