X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-select-eth-device.sh;h=d767455b3a823db39f061ac5dff04b543c815c0d;hb=HEAD;hp=df006662236e5a435276bdcd4ab6d2ee1300c72c;hpb=9ab5aeeecac939f82c77536a6e21b505d9841b96;p=live-boot-grml.git

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index df00666..d767455 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
@@ -39,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
 
@@ -55,8 +81,26 @@ Select_eth_device ()
 			case "${ARGUMENT}" in
 				live-netdev=*)
 				NETDEV="${ARGUMENT#live-netdev=}"
+
+				# Check if NETDEV is a valid MAC address
+				if echo "$NETDEV" | grep -Eq '^[0-9A-Fa-f]{2}[:-]([0-9A-Fa-f]{2}[:-]){4}[0-9A-Fa-f]{2}$'
+				then
+					echo "NETDEV is a valid MAC address."
+
+					# Retrieve the device name associated with the MAC address
+					DEVICE_NAME=$(ip -o link | awk -v mac="$NETDEV" '$0 ~ mac{print substr($2, 1, length($2)-1)}')
+					if [ -n "$DEVICE_NAME" ]
+					then
+						echo "Device name for MAC address $NETDEV is $DEVICE_NAME."
+						NETDEV="$DEVICE_NAME"
+					fi
+				else
+					echo "NETDEV is not a valid MAC address. Assuming it is a device name."
+				fi
+
 				echo "DEVICE=$NETDEV" >> /conf/param.conf
-				echo "Found live-netdev parameter, forcing to to use network device $NETDEV."
+				echo "Found live-netdev parameter, forcing it to use network device $NETDEV."
+				Wait_for_carrier "$NETDEV"
 				return
 				;;
 			esac
@@ -75,6 +119,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 ''
@@ -83,6 +128,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
@@ -92,6 +138,7 @@ Select_eth_device ()
 						echo "Connected $interface found"
 						# inform initrd's init script :
 						found_eth_dev="$found_eth_dev $interface"
+						found_eth_dev="$(echo $found_eth_dev | sed -e "s/^[[:space:]]*//g")"
 						;;
 				esac
 			done