X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-networking.sh;h=9cc367442b91f31c2d1f384b73175266352efc20;hb=27bc786ffea0c796827b628fb48fcdd755eace9d;hp=cdec92a98a963194f261e17075530e8f8a733a43;hpb=a331218718282c5496ff062a0f6aa55908224862;p=live-boot-grml.git

diff --git a/components/9990-networking.sh b/components/9990-networking.sh
index cdec92a..9cc3674 100755
--- a/components/9990-networking.sh
+++ b/components/9990-networking.sh
@@ -9,48 +9,47 @@ Device_from_bootif ()
 
 	if [ -n "${BOOTIF}" ]
 	then
-	# pxelinux sets BOOTIF to a value based on the mac address of the
-	# network card used to PXE boot, so use this value for DEVICE rather
-	# than a hard-coded device name from initramfs.conf. this facilitates
-	# network booting when machines may have multiple network cards.
-	# pxelinux sets BOOTIF to 01-$mac_address
-
-	# strip off the leading "01-", which isn't part of the mac
-	# address
-	temp_mac=${BOOTIF#*-}
-
-	# convert to typical mac address format by replacing "-" with ":"
-	bootif_mac=""
-	IFS='-'
-	for x in $temp_mac
-	do
-		if [ -z "$bootif_mac" ]
-		then
-			bootif_mac="$x"
-		else
-			bootif_mac="$bootif_mac:$x"
-		fi
-	done
-	unset IFS
-
-	# look for devices with matching mac address, and set DEVICE to
-	# appropriate value if match is found.
+		# pxelinux sets BOOTIF to a value based on the mac address of the
+		# network card used to PXE boot, so use this value for DEVICE rather
+		# than a hard-coded device name from initramfs.conf. this facilitates
+		# network booting when machines may have multiple network cards.
+		# pxelinux sets BOOTIF to 01-$mac_address
+
+		# strip off the leading "01-", which isn't part of the mac
+		# address
+		temp_mac=${BOOTIF#*-}
+
+		# convert to typical mac address format by replacing "-" with ":"
+		bootif_mac=""
+		IFS='-'
+		for x in $temp_mac
+		do
+			if [ -z "$bootif_mac" ]
+			then
+				bootif_mac="$x"
+			else
+				bootif_mac="$bootif_mac:$x"
+			fi
+		done
+		unset IFS
 
-	for device in /sys/class/net/*
-	do
-		if [ -f "$device/address" ]
-		then
-		current_mac=$(cat "$device/address")
+		# look for devices with matching mac address, and set DEVICE to
+		# appropriate value if match is found.
 
-			if [ "$bootif_mac" = "$current_mac" ]
+		for device in /sys/class/net/*
+		do
+			if [ -f "$device/address" ]
 			then
-				DEVICE=${device##*/}
-				break
+			current_mac=$(cat "$device/address")
+
+				if [ "$bootif_mac" = "$current_mac" ]
+				then
+					DEVICE=${device##*/}
+					break
+				fi
 			fi
-		fi
-	done
+		done
 	fi
-
 }
 
 do_netsetup ()
@@ -85,30 +84,20 @@ do_netsetup ()
 		fi
 
 		# split args of ethdevice=eth0,eth1 into "eth0 eth1"
-		for device in $(echo $ETHDEVICE | sed 's/,/ /g')
+		for device in $(echo "$ETHDEVICE" | sed 's/,/ /g')
 		do
 			devlist="$devlist $device"
 		done
 
-		# this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
-		# an endless loop; if execution fails give it two further tries, that's
-		# why we use '$devlist $devlist $devlist' for the other for loop
-		for dev in $devlist $devlist $devlist
+		for dev in $devlist
 		do
 			echo "Executing ipconfig -t $ETHDEV_TIMEOUT $dev"
-			ipconfig -t "$ETHDEV_TIMEOUT" $dev | tee -a /netboot.config &
-			jobid=$!
-			sleep "$ETHDEV_TIMEOUT" ; sleep 1
-			if [ -r /proc/"$jobid"/status ]
-			then
-				echo "Killing job $jobid for device $dev as ipconfig ran into recursion..."
-				kill -9 $jobid
-			fi
+			ipconfig -t "$ETHDEV_TIMEOUT" "$dev" | tee -a /netboot.config
 
 			# 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
@@ -116,9 +105,9 @@ do_netsetup ()
 		done
 	else
 		for interface in ${DEVICE}; do
-			ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
+			ipconfig -t "$ETHDEV_TIMEOUT" "${interface}" | tee "/netboot-${interface}.config"
 
-			[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
+			[ -e "/run/net-${interface}.conf" ] && . "/run/net-${interface}.conf"
 
 			if [ "$IPV4ADDR" != "0.0.0.0" ]
 			then
@@ -132,14 +121,30 @@ do_netsetup ()
 		# source relevant ipconfig output
 		OLDHOSTNAME=${HOSTNAME}
 
-		[ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
+		[ -e "/run/net-${interface}.conf" ] && . "/run/net-${interface}.conf"
 
-		[ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
+		[ -z "${HOSTNAME}" ] && HOSTNAME="${OLDHOSTNAME}"
 		export HOSTNAME
 
 		if [ -n "${interface}" ]
 		then
-			HWADDR="$(cat /sys/class/net/${interface}/address)"
+			HWADDR="$(cat "/sys/class/net/${interface}/address")"
+		fi
+
+		# Only create /etc/hosts if FQDN is known (to let 'hostname -f' query
+		# this file). Otherwise DNS will be queried to determine the FQDN.
+		if [ ! -e "/etc/hosts" ] && [ -n "${DNSDOMAIN}" ]
+		then
+			echo "Creating /etc/hosts"
+			cat > /etc/hosts <<EOF
+127.0.0.1	localhost
+127.0.1.1	${HOSTNAME}.${DNSDOMAIN}	${HOSTNAME}
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+EOF
 		fi
 
 		if [ ! -e "/etc/resolv.conf" ]
@@ -152,7 +157,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