X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F23networking;h=cfc565d365df638bc694d8758a2c58229c99af66;hb=c972c6eea545add125883eaaeea459551e54589c;hp=8f4b698c7fdeb4efee5fdb6c6e95c39708bd68d7;hpb=8a4793dbe68ec2e28f0dbcc123f13339f57fac2b;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 8f4b698..cfc565d 100755
--- a/scripts/casper-bottom/23networking
+++ b/scripts/casper-bottom/23networking
@@ -4,7 +4,7 @@ PREREQ=""
 DESCRIPTION="Preconfiguring networking..."
 IFFILE="/root/etc/network/interfaces"
 
-. /scripts/functions
+. /scripts/casper-functions
 
 prereqs()
 {
@@ -21,10 +21,10 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-if [ "${STATICIP}" == "frommedia" ] && [ -e  "$IFFILE" ] ; then
-	# will use existent /etc/network/interfaces
-	log_end_msg
-	exit 0
+if [ "${STATICIP}" = "frommedia" -a -e  "$IFFILE" ] ; then
+    # will use existent /etc/network/interfaces
+    log_end_msg
+    exit 0
 fi
 
 cat > "$IFFILE" <<EOF
@@ -34,16 +34,16 @@ iface lo inet loopback
 EOF
 
 udevtrigger
+udevsettle
 
-if [ -z "${NETBOOT}" ] ; then
-	if [ ! -z "${STATICIP}" ] && [ "${STATICIP}" != "frommedia" ]; then
-		parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
-		for ifline in ${parsed}; do
-			ifname="$(echo ${ifline} | cut -f1 -d ',')"
-			ifaddress="$(echo ${ifline} | cut -f2 -d ',')"
-			ifnetmask="$(echo ${ifline} | cut -f3 -d ',')"
-			ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
-			cat >> "$IFFILE" <<EOF
+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 ',')"
+        ifaddress="$(echo ${ifline} | cut -f2 -d ',')"
+        ifnetmask="$(echo ${ifline} | cut -f3 -d ',')"
+        ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
+        cat >> "$IFFILE" <<EOF
 auto ${ifname}
 iface ${ifname} inet static
     address ${ifaddress}
@@ -51,18 +51,49 @@ iface ${ifname} inet static
     gateway ${ifgateway}
 
 EOF
-		done
-	else
-		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
+    done
+else
+    if [ -z "${NETBOOT}" ]; then
+        # default, dhcp assigned
+        method="dhcp"
+    else
+        # make sure that the preconfigured interface would not get reassigned by dhcp
+        # 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 dhcp
+iface $i inet ${method}
 
 EOF
-		done
-	fi
+    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