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 133d4b1..d767455 100755 (executable)
--- 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,35 +71,43 @@ 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=}"
-                                # net device could be specified by MAC address
-                                hex="[0-9A-Fa-f][0-9A-Fa-f]"
-                                case "${NETDEV}" in
-                                    ${hex}:${hex}:${hex}:${hex}:${hex}:${hex})
-                                        # MAC address; record it and select later
-                                        netdev_mac_addr="${NETDEV}"
-                                        ;;
-                                    *)
-                                        # interface name
-                                        echo "DEVICE=$NETDEV" >> /conf/param.conf
-                                        echo "Found live-netdev parameter, forcing to to use network device $NETDEV."
-                                        return
-                                        ;;
-                                esac
-                                ;;
-                        esac
-                done
-        else
-                l_interfaces="$DEVICE"
-        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=}"
+
+                               # 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 it to use network device $NETDEV."
+                               Wait_for_carrier "$NETDEV"
+                               return
+                               ;;
+                       esac
+               done
+       else
+               l_interfaces="$DEVICE"
+       fi
 
        found_eth_dev=""
        while true
@@ -86,44 +119,37 @@ 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 ''
 
-                for step in 1 2 3 4 5
-                do
-                        for interface in $l_interfaces
-                        do
-                            if [ -z "$netdev_mac_addr" ]; then
-                                carrier=$(cat /sys/class/net/$interface/carrier \
-                                        2>/dev/null)
-                                # link detected
-
-                                case "${carrier}" in
-                                        1)
-                                                echo "Connected $interface found"
-                                                # inform initrd's init script :
-                                                found_eth_dev="$found_eth_dev $interface"
-                                                ;;
-                                esac
-                            else
-                                # MAC addr given, check for that
-                                mac_addr=$(ifconfig "$interface" \
-                                                  | grep HWaddr \
-                                                  | { read _ _ _ _ mac_addr; echo $mac_addr; })
-                                if [ "$mac_addr" = "$netdev_mac_addr" ]; then
-                                    found_eth_dev="$interface"
-                                fi
-                            fi
-                        done
-                        if [ -n "$found_eth_dev" ]
-                        then
-                                echo "DEVICE='$found_eth_dev'" >> /conf/param.conf
-                                return
-                        else
-                                # wait a bit
-                                sleep 1
-                        fi
-                done
-        done
+               for step in 1 2 3 4 5
+               do
+                       for interface in $l_interfaces
+                       do
+                               ip link set $interface up
+                               carrier=$(cat /sys/class/net/$interface/carrier \
+                                       2>/dev/null)
+                               # link detected
+
+                               case "${carrier}" in
+                                       1)
+                                               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
+                       if [ -n "$found_eth_dev" ]
+                       then
+                               echo "DEVICE='$found_eth_dev'" >> /conf/param.conf
+                               return
+                       else
+                               # wait a bit
+                               sleep 1
+                       fi
+               done
+       done
 }