X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=4ebb944659720a322c5463ae5353f7a7e4816def;hb=088e23d8225c53f92bc12125d95a11e165869a9a;hp=6a669967e880bb868cd56b7fb0b5590cf770675a;hpb=5f0f3b0c36d433a462176f970d371c77c3020749;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 6a66996..4ebb944 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -46,16 +46,8 @@ iface lo inet loopback
 
 EOF
 
-if [ -x /sbin/udevadm ]
-then
-	# lenny
-	udevadm trigger
-	udevadm settle
-else
-	# etch
-	udevtrigger
-	udevsettle
-fi
+udevadm trigger
+udevadm settle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
 then
@@ -90,7 +82,7 @@ else
 	fi
 
 	# iterate the physical interfaces and add them to the interfaces list
-	if [ "${method}" != dhcp ] || [ ! -x /root/usr/sbin/NetworkManager ]
+	if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
 	then
 		for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
 		do