X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=6a669967e880bb868cd56b7fb0b5590cf770675a;hb=f4238ae20312e1d36158ba70ac1076ba4da0211d;hp=c6ec9cc8c4b272aada8806d5e837e3df40d945bb;hpb=cb896241d0ec8eb2bba0cecd11de3500869176a6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index c6ec9cc..6a66996 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -27,27 +27,35 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Preconfiguring networking..."
+log_begin_msg "Preconfiguring networking"
 
 # live-initramfs script
 
 IFFILE="/root/etc/network/interfaces"
 
-if [ "${STATICIP}" = "frommedia" -a -e  "$IFFILE" ]
+if [ "${STATICIP}" = "frommedia" -a -e  "${IFFILE}" ]
 then
 	# will use existent /etc/network/interfaces
 	log_end_msg
 	exit 0
 fi
 
-cat > "$IFFILE" << EOF
+cat > "${IFFILE}" << EOF
 auto lo
 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
@@ -60,7 +68,7 @@ then
 		ifnetmask="$(echo ${ifline} | cut -f3 -d ',')"
 		ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
 
-cat >> "$IFFILE" << EOF
+cat >> "${IFFILE}" << EOF
 auto ${ifname}
 iface ${ifname} inet static
     address ${ifaddress}
@@ -82,35 +90,40 @@ else
 	fi
 
 	# iterate the physical interfaces and add them to the interfaces list
-	for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
-	do
-		[ -e $interface ] || continue
-		i="$(basename $interface)"
+	if [ "${method}" != dhcp ] || [ ! -x /root/usr/sbin/NetworkManager ]
+	then
+		for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
+		do
+			[ -e ${interface} ] || continue
+			i="$(basename ${interface})"
 
-cat >> "$IFFILE" << EOF
-auto $i
-iface $i inet $method
+cat >> "${IFFILE}" << EOF
+auto ${i}
+iface ${i} inet ${method}
 
 EOF
 
-	done
+		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
@@ -121,20 +134,24 @@ ${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
 
-#for i in eth0 eth1 eth2 ath0 wlan0
-#do
-#	grep -q "iface $i" $IFFILE && continue
+#if [ ! -x /root/usr/sbin/NetworkManager ]
+#then
+#	for i in eth0 eth1 eth2 ath0 wlan0
+#	do
+#		grep -q "iface ${i}" ${IFFILE} && continue
 #
-#cat >> "$IFFILE" << EOF
-#auto $i
-#iface $i inet dhcp
+#cat >> "${IFFILE}" << EOF
+#auto ${i}
+#iface ${i} inet dhcp
 #
 #EOF
 #
-#done
+#	done
+#fi
 
 log_end_msg