Adding upstream version 2.0~a1.

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

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 603116f..d73f63b 100755 (executable)
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -18,7 +18,7 @@ case "${1}" in
                ;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NONETWORKING}" ]
 then
@@ -27,9 +27,9 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Preconfiguring networking..."
+log_begin_msg "Preconfiguring networking"
 
-# live-initramfs script
+# live-boot script
 
 IFFILE="/root/etc/network/interfaces"
 
@@ -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
@@ -98,33 +98,36 @@ EOF
                done
        fi
 
-       if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ]
+       if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ]
        then
-               # create a resolv.conf if it is not present
-               cp /netboot.config /root/var/log/netboot.config
+               if [ -f /netboot.config ]
+               then
+                       # create a resolv.conf if it is not present or empty
+                       cp /netboot.config /root/var/log/netboot.config
 
-               rc_search=$(cat netboot.config | awk '/domain/{print $3}')
-               rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
-               rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
-               rc_server0="nameserver ${rc_server0}"
+                       rc_search=$(cat netboot.config | awk '/domain/{print $3}')
+                       rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
+                       rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
+                       rc_server0="nameserver ${rc_server0}"
 
-               if [ "${rc_server1}" = "0.0.0.0" ]
-               then
-                       rc_server1=""
-               else
-                       rc_server1="nameserver ${rc_server1}"
-               fi
+                       if [ "${rc_server1}" = "0.0.0.0" ]
+                       then
+                               rc_server1=""
+                       else
+                               rc_server1="nameserver ${rc_server1}"
+                       fi
 
 cat > /root/etc/resolv.conf << EOF
 # /etc/resolv.conf
-# Autogenerated by live-initramfs
+# Autogenerated by live-boot
 search ${rc_search}
 domain ${rc_search}
 ${rc_server0}
 ${rc_server1}
 EOF
 
-               cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+                       cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+               fi
        fi
 fi