projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b0335f
)
Avoid re-access /proc/cmdline in select-eth-device function and use internal variable...
author
Daniel Baumann
<daniel@debian.org>
Wed, 25 Jul 2012 15:07:53 +0000
(17:07 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 25 Jul 2012 15:25:05 +0000
(17:25 +0200)
scripts/boot/9990-select-eth-device.sh
patch
|
blob
|
history
diff --git
a/scripts/boot/9990-select-eth-device.sh
b/scripts/boot/9990-select-eth-device.sh
index
ed1da6f
..
5a769ce
100755
(executable)
--- 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)
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=*)
do
case "${ARGUMENT}" in
netboot=*)
@@
-40,13
+40,13
@@
Select_eth_device ()
fi
# If user force to use specific device, write it
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
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
return
;;
esac