From: Michael Prokop <mika@grml.org>
Date: Fri, 8 Sep 2023 09:14:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/16'
X-Git-Tag: debian/1%20210208+grml.5~2
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=669a046ab0e9fc85bbad979c25ea167089c4accc;hp=c838bea57ec27c7ba6f339a7e44b0199cd4a2969

Merge remote-tracking branch 'origin/github/pr/16'
---

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index b660a3d..da6d8c8 100755
--- a/components/9990-select-eth-device.sh
+++ b/components/9990-select-eth-device.sh
@@ -78,15 +78,31 @@ Select_eth_device ()
 		# 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."
-				Wait_for_carrier $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"