X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-select-eth-device.sh;h=365d64b6b95098102845efc50394992b171ac59e;hb=4e260c46192d5c6e67fd7b6775aaa2f07ea8301e;hp=7d1aa163282e002b68ebb7b9956a3b34fce2e3ec;hpb=a331218718282c5496ff062a0f6aa55908224862;p=live-boot-grml.git

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index 7d1aa16..365d64b 100755
--- a/components/9990-select-eth-device.sh
+++ b/components/9990-select-eth-device.sh
@@ -1,5 +1,30 @@
 #!/bin/sh
 
+Wait_for_carrier ()
+{
+	# $1 = network device
+	echo -n "Waiting for link to come up on $1... "
+	ip link set $1 up
+	for step in $(seq 1 15)
+	do
+		carrier=$(cat /sys/class/net/$1/carrier \
+		2>/dev/null)
+		case "${carrier}" in
+			1)
+			echo -e "\nLink is up"
+			return
+			;;
+			*)
+			# Counter
+			echo -n "$step "
+			;;
+		esac
+		sleep 1
+	done
+	echo -e "\nError - carrier not detected on $1."
+	ip link set $1 down
+}
+
 Select_eth_device ()
 {
 	# Boot type in initramfs's config
@@ -24,6 +49,10 @@ Select_eth_device ()
 	# we want to do some basic IP
 	modprobe -q af_packet
 
+	# Ensure all our net modules get loaded so we can actually compare MAC addresses...
+	udevadm trigger
+	udevadm settle
+
 	# Available Ethernet interfaces ?
 	l_interfaces=""
 
@@ -35,13 +64,14 @@ Select_eth_device ()
 		echo "Waiting for ethernet card(s) up... If this fails, maybe the ethernet card is not supported by the kernel `uname -r`?"
 		while [ -z "$l_interfaces" ]
 		do
-			l_interfaces="$(cd /sys/class/net/ && ls -d eth* 2>/dev/null)"
+			l_interfaces="$(cd /sys/class/net/ && ls -d * 2>/dev/null | grep -v "lo")"
 		done
 
 		if [ $(echo $l_interfaces | wc -w) -lt 2 ]
 		then
 			# only one interface : no choice
 			echo "DEVICE=$l_interfaces" >> /conf/param.conf
+			Wait_for_carrier $l_interfaces
 			return
 		fi
 
@@ -53,6 +83,7 @@ Select_eth_device ()
 				NETDEV="${ARGUMENT#live-netdev=}"
 				echo "DEVICE=$NETDEV" >> /conf/param.conf
 				echo "Found live-netdev parameter, forcing to to use network device $NETDEV."
+				Wait_for_carrier $NETDEV
 				return
 				;;
 			esac
@@ -71,6 +102,7 @@ Select_eth_device ()
 			# ATTR{carrier} is not set if this is not done
 			echo -n " $interface ?"
 			ipconfig -c none -d $interface -t 1 >/dev/null 2>&1
+			sleep 1
 		done
 
 		echo ''
@@ -79,6 +111,7 @@ Select_eth_device ()
 		do
 			for interface in $l_interfaces
 			do
+				ip link set $interface up
 				carrier=$(cat /sys/class/net/$interface/carrier \
 					2>/dev/null)
 				# link detected
@@ -87,7 +120,7 @@ Select_eth_device ()
 					1)
 						echo "Connected $interface found"
 						# inform initrd's init script :
-						found_eth_dev="$found_eth_dev $interface"
+						found_eth_dev="$interface"
 						;;
 				esac
 			done