X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-select-eth-device.sh;h=da6d8c8a4addd243e1deb58153a6c547197fbea6;hb=0fe109773979cedd0aa0063096eaa94b6fc6d052;hp=09642c8d5463e118fc2b7606d115cf34bdef2073;hpb=ef866fdbab3cc24dab6aa56054f6779398bced2a;p=live-boot-grml.git

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index 09642c8..da6d8c8 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
@@ -46,20 +71,38 @@ Select_eth_device ()
 		then
 			# only one interface : no choice
 			echo "DEVICE=$l_interfaces" >> /conf/param.conf
+			Wait_for_carrier $l_interfaces
 			return
 		fi
 
 		# If user force to use specific device, write it
 		for ARGUMENT in ${LIVE_BOOT_CMDLINE}
 		do
-			case "${ARGUMENT}" in
-				live-netdev=*)
-				NETDEV="${ARGUMENT#live-netdev=}"
-				echo "DEVICE=$NETDEV" >> /conf/param.conf
-				echo "Found live-netdev parameter, forcing to to use network device $NETDEV."
-				return
-				;;
-			esac
+                        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."
+                              # Assign NETDEV directly to $NETDEV
+                              NETDEV="$NETDEV"
+                            fi
+                            echo "DEVICE=$NETDEV" >> /conf/param.conf
+                            echo "Found live-netdev parameter, forcing it to use network device $NETDEV."
+                            Wait_for_carrier "$NETDEV"
+                            return
+                            ;;
+                        esac
 		done
 	else
 		l_interfaces="$DEVICE"
@@ -75,6 +118,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 +127,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
@@ -91,7 +136,8 @@ Select_eth_device ()
 					1)
 						echo "Connected $interface found"
 						# inform initrd's init script :
-						found_eth_dev="$interface"
+						found_eth_dev="$found_eth_dev $interface"
+						found_eth_dev="$(echo $found_eth_dev | sed -e "s/^[[:space:]]*//g")"
 						;;
 				esac
 			done