[SCM] live-boot branch, debian-next, updated. debian/3.0_a12-1-5-gd5d512b
Richard Nelson
unixabg at gmail.com
Sat Dec 4 04:13:33 UTC 2010
The following commit has been merged in the debian-next branch:
commit d5d512ba775527a01d31eacf7fbb163f4211946d
Author: Richard Nelson <unixabg at gmail.com>
Date: Fri Dec 3 22:05:35 2010 -0600
Populate adapters in /etc/network/interfaces when ethdevice= on cmdline.
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 9554b77..86d4562 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -89,8 +89,8 @@ else
method="manual"
fi
- # iterate the physical interfaces and add them to the interfaces list
- if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
+ # iterate the physical interfaces and add them to the interfaces list and also add when ethdevice= called on cmdline
+ if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ]) || [ ! -z "${ETHDEVICE}" ]
then
for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
do
--
live-boot
More information about the debian-live-changes
mailing list