From a73e6a2241e335d5854112ea379cc3bd6b2a12ec Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 25 Jul 2012 17:07:53 +0200 Subject: [PATCH] Avoid re-access /proc/cmdline in select-eth-device function and use internal variable instead. --- scripts/boot/9990-select-eth-device.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/boot/9990-select-eth-device.sh b/scripts/boot/9990-select-eth-device.sh index ed1da6f..5a769ce 100755 --- a/scripts/boot/9990-select-eth-device.sh +++ b/scripts/boot/9990-select-eth-device.sh @@ -6,7 +6,7 @@ Select_eth_device () bootconf=$(egrep '^BOOT=' /conf/initramfs.conf | tail -1) # can be superseded by command line (used by Debian-Live's netboot for example) - for ARGUMENT in $(cat /proc/cmdline) + for ARGUMENT in ${_CMDLINE} do case "${ARGUMENT}" in netboot=*) @@ -40,13 +40,13 @@ Select_eth_device () fi # If user force to use specific device, write it - for ARGUMENT in $(cat /proc/cmdline) + for ARGUMENT in ${_CMDLINE} do case "${ARGUMENT}" in live-netdev=*) NETDEV="${ARGUMENT#live-netdev=}" echo "DEVICE=$NETDEV" >> /conf/param.conf - echo "Found live-netdev parameter in /proc/cmdline. Force to use network device $NETDEV." + echo "Found live-netdev parameter, forcing to to use network device $NETDEV." return ;; esac -- 2.1.4