From: Richard Nelson <unixabg@gmail.com>
Date: Sat, 4 Dec 2010 04:05:35 +0000 (-0600)
Subject: Populate adapters in /etc/network/interfaces when ethdevice= on cmdline.
X-Git-Tag: debian/3.0_a15-1~17
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=9ceea12373a7fb57093d07ffbb87352a8b5655a8

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