X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F23networking;h=f4103211098997561ce2c7e322bf0804f4b89722;hb=refs%2Ftags%2Fdebian%2F1.71%2Bdebian-1;hp=723877302fd8a7a9fcbd70a5931b338e8b1090c3;hpb=4a0b1ba4d428c623d14bae7f0db85c80abb0da0a;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 7238773..f410321 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,35 +21,48 @@ 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
+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}" ] ; 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
+auto ${ifname}
+iface ${ifname} inet static
+    address ${ifaddress}
+    netmask ${ifnetmask}
+    gateway ${ifgateway}
 
 EOF
-done
-
-for i in eth0 eth1 eth2 ath0 wlan0; do
-    [ ! -e /sys/class/net/$i ] || continue
-    cat >> "$IFFILE" <<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
 auto $i
 iface $i inet dhcp
 
 EOF
-done
+		done
+	fi
+fi
 
 log_end_msg