X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F23networking;h=2bdf9b0ebfe6a5f9b577e41c2abb2f6fdeb6c515;hb=9b2007f0c8e6a794895610d51cfdeb8abc0a2e36;hp=ca7dd1350f78eca0fda0df23d0bcd69ae7277245;hpb=c8e8ee4983b9bffa74138712eae61c94c34b2845;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index ca7dd13..2bdf9b0 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,39 +21,56 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
+if [ "${STATICIP}" == "frommedia" ] && [ -e  "$IFFILE" ] ; then
+    # will use existent /etc/network/interfaces
+    log_end_msg
+    exit 0
+fi
+
 cat > "$IFFILE" <<EOF
 auto lo
 iface lo inet loopback
 
 EOF
 
-if [ -x /sbin/udevplug ]; then
-	udevplug -Bpci -Iclass="0x02*"
-else
-	udevtrigger
-fi
-
-if [ -z "${NETBOOT}" ] ; then
+udevtrigger
 
-	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
+if [ -z "${NETBOOT}" -a -n "${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
+auto ${ifname}
+iface ${ifname} inet static
+    address ${ifaddress}
+    netmask ${ifnetmask}
+    gateway ${ifgateway}
 
 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
 
-	done
-fi
-
-for i in eth0 eth1 eth2 ath0 wlan0; do
-    [ ! -e /sys/class/net/$i ] || continue
-    cat >> "$IFFILE" <<EOF
-auto $i
-iface $i inet dhcp
+    # 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}
 
 EOF
-done
+    done
+fi
 
 log_end_msg