[SCM] live-boot branch, debian-next, updated. debian/3.0_36-1-8-gea72b63
Daniel Baumann
daniel at debian.org
Wed Jul 25 15:07:05 UTC 2012
The following commit has been merged in the debian-next branch:
commit ea72b6391ef4bd43d7b90ffce1d36a4eee2e049f
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 25 17:07:53 2012 +0200
Avoid re-access /proc/cmdline in select-eth-device function and use internal variable instead.
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
--
live-boot
More information about the debian-live-changes
mailing list