From: Daniel Baumann Date: Mon, 24 Jun 2013 20:19:28 +0000 (+0200) Subject: Updating indenting in network component. X-Git-Tag: debian/4.0_a14-1~9 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=601865bed552e7018e56be921848e7703c594153 Updating indenting in network component. --- diff --git a/components/9990-networking.sh b/components/9990-networking.sh index cdec92a..dbdc913 100755 --- a/components/9990-networking.sh +++ b/components/9990-networking.sh @@ -9,48 +9,47 @@ Device_from_bootif () if [ -n "${BOOTIF}" ] then - # pxelinux sets BOOTIF to a value based on the mac address of the - # network card used to PXE boot, so use this value for DEVICE rather - # than a hard-coded device name from initramfs.conf. this facilitates - # network booting when machines may have multiple network cards. - # pxelinux sets BOOTIF to 01-$mac_address - - # strip off the leading "01-", which isn't part of the mac - # address - temp_mac=${BOOTIF#*-} - - # convert to typical mac address format by replacing "-" with ":" - bootif_mac="" - IFS='-' - for x in $temp_mac - do - if [ -z "$bootif_mac" ] - then - bootif_mac="$x" - else - bootif_mac="$bootif_mac:$x" - fi - done - unset IFS - - # look for devices with matching mac address, and set DEVICE to - # appropriate value if match is found. + # pxelinux sets BOOTIF to a value based on the mac address of the + # network card used to PXE boot, so use this value for DEVICE rather + # than a hard-coded device name from initramfs.conf. this facilitates + # network booting when machines may have multiple network cards. + # pxelinux sets BOOTIF to 01-$mac_address + + # strip off the leading "01-", which isn't part of the mac + # address + temp_mac=${BOOTIF#*-} + + # convert to typical mac address format by replacing "-" with ":" + bootif_mac="" + IFS='-' + for x in $temp_mac + do + if [ -z "$bootif_mac" ] + then + bootif_mac="$x" + else + bootif_mac="$bootif_mac:$x" + fi + done + unset IFS - for device in /sys/class/net/* - do - if [ -f "$device/address" ] - then - current_mac=$(cat "$device/address") + # look for devices with matching mac address, and set DEVICE to + # appropriate value if match is found. - if [ "$bootif_mac" = "$current_mac" ] + for device in /sys/class/net/* + do + if [ -f "$device/address" ] then - DEVICE=${device##*/} - break + current_mac=$(cat "$device/address") + + if [ "$bootif_mac" = "$current_mac" ] + then + DEVICE=${device##*/} + break + fi fi - fi - done + done fi - } do_netsetup ()