X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=4ebb944659720a322c5463ae5353f7a7e4816def;hb=24b9fd1c70013f5847d3a4658e56bd44534e7890;hp=6c726c6deb2f6620ae2ee3472869f6da4757f098;hpb=fa32070515baa0156f7cf59e9d06a4a3a468c409;p=live-boot-grml.git diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking index 6c726c6..4ebb944 100755 --- a/scripts/live-bottom/23networking +++ b/scripts/live-bottom/23networking @@ -27,7 +27,7 @@ fi . /scripts/live-functions -log_begin_msg "Preconfiguring networking..." +log_begin_msg "Preconfiguring networking" # live-initramfs script @@ -46,8 +46,8 @@ iface lo inet loopback EOF -udevtrigger -udevsettle +udevadm trigger +udevadm settle if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ] then @@ -82,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