X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F23networking;h=116b1d650668256fa67c2e29a850c177b9ba3287;hb=beec4f9fb766be23d575b070e398639d5a4a9c9d;hp=2bdf9b0ebfe6a5f9b577e41c2abb2f6fdeb6c515;hpb=0a8e85ff66e30694a0583614f0ae90c36e8d44f6;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 2bdf9b0..116b1d6 100755
--- 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
@@ -33,9 +33,14 @@ iface lo inet loopback
 
 EOF
 
-udevtrigger
+if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+    udevtrigger -Bpci -Iclass="0x02*"
+else
+    udevtrigger
+fi
+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 ',')"
@@ -71,6 +76,28 @@ 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
 
 log_end_msg