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

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index 365d64b..d767455 100755
--- a/components/9990-select-eth-device.sh
+++ b/components/9990-select-eth-device.sh
@@ -81,9 +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."
-				Wait_for_carrier $NETDEV
+				echo "Found live-netdev parameter, forcing it to use network device $NETDEV."
+				Wait_for_carrier "$NETDEV"
 				return
 				;;
 			esac
@@ -120,7 +137,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