Release new version 1:20210208+grml.5

[live-boot-grml.git] / components / 9990-select-eth-device.sh

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index 365d64b..d767455 100755 (executable)
--- 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