Adding live-initramfs 1.87.1-1.

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

diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 2bdf9b0..1b732d3 100755 (executable)
--- a/scripts/casper-bottom/23networking
+++ b/scripts/casper-bottom/23networking
@@ -21,7 +21,7 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-if [ "${STATICIP}" == "frommedia" ] && [ -e  "$IFFILE" ] ; then
+if [ "${STATICIP}" = "frommedia" -a -e  "$IFFILE" ] ; then
     # will use existent /etc/network/interfaces
     log_end_msg
     exit 0
@@ -34,8 +34,9 @@ iface lo inet loopback
 EOF
 
 udevtrigger
+udevsettle
 
-if [ -z "${NETBOOT}" -a -n "${STATICIP}" ] && [ "${STATICIP}" != "frommedia" ]; then
+if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]; then
     parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
     for ifline in ${parsed}; do
         ifname="$(echo ${ifline} | cut -f1 -d ',')"
@@ -60,17 +61,47 @@ else
         # on startup by ifup script - otherwise our root fs might be disconnected!
         method="manual"
     fi
-
     # iterate the physical interfaces and add them to the interfaces list
     for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*; do
         [ -e $interface ] || continue
         i="$(basename $interface)"
         cat >> "$IFFILE" <<EOF
-auto ${i}
-iface ${i} inet ${method}
+auto $i
+iface $i inet $method
 
 EOF
     done
+    if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ] ; then
+        # create a resolv.conf if it is not present
+        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}"
+        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 casper
+search ${rc_search}
+domain ${rc_search}
+${rc_server0}
+${rc_server1}
+EOF
+        cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+    fi
 fi
 
+for i in eth0 eth1 eth2 ath0 wlan0; do
+    grep -q "iface $i" $IFFILE && continue
+    cat >> "$IFFILE" <<EOF
+auto $i
+iface $i inet dhcp
+
+EOF
+done
+
 log_end_msg