Skip to content

Commit

Permalink
live-netdev: unify coding style and drop noop $NETDEV assignment
Browse files Browse the repository at this point in the history
Upstream uses tabs instead of whitespace and if\nthen etc coding style,
while I personally don't like this, let's keep coding style consistent,
to make synching and contributions towards upstream easier.

While at it, the NETDEV="$NETDEV" is a noop, as the variable is assigned
to itself, so drop it.
  • Loading branch information
mika committed Sep 8, 2023
1 parent 669a046 commit 876ec30
Showing 1 changed file with 26 additions and 25 deletions.
51 changes: 26 additions & 25 deletions components/9990-select-eth-device.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,31 +78,32 @@ 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=}"

# 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
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"
Expand Down

0 comments on commit 876ec30

Please sign in to comment.