Adding proper code comments about vol_id removal.

[live-boot-grml.git] / scripts / live-bottom / 23networking

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 6a66996..4ebb944 100755 (executable)
--- 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