Adding upstream version 2.0.2.
[live-boot-grml.git] / scripts / live-bottom / 23networking
index 988206e..8c856c6 100755 (executable)
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Preconfiguring networking..."
-IFFILE="/root/etc/network/interfaces"
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+       echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+       prereqs)
+               prereqs
+               exit 0
+               ;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-boot header
+
+if [ -n "${NONETWORKING}" ]
+then
+       exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Preconfiguring networking"
+
+# live-boot script
 
-if [ "${STATICIP}" = "frommedia" -a -e  "$IFFILE" ] ; then
-    # will use existent /etc/network/interfaces
-    log_end_msg
-    exit 0
+IFFILE="/root/etc/network/interfaces"
+
+if [ "${STATICIP}" = "frommedia" -a -e  "${IFFILE}" ]
+then
+       # will use existent /etc/network/interfaces
+       log_end_msg
+       exit 0
 fi
 
-cat > "$IFFILE" <<EOF
+cat > "${IFFILE}" << EOF
 auto lo
 iface lo inet loopback
 
 EOF
 
-udevtrigger
-udevsettle
-
-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}
+udevadm trigger
+udevadm settle
+
+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
+allow-hotplug ${ifname}
 iface ${ifname} inet static
     address ${ifaddress}
     netmask ${ifnetmask}
     gateway ${ifgateway}
 
 EOF
-    done
+
+       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 $method
+       if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
+       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
+       if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
+       then
+               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
+allow-hotplug ${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
+
+               done
+       fi
+
+       if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ]
+       then
+               if [ -f /netboot.config ]
+               then
+                       # create a resolv.conf if it is not present or empty
+                       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
+# Autogenerated by live-boot
 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
+                       cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+               fi
+       fi
+fi
 
-EOF
-done
+#if [ ! -x /root/usr/sbin/NetworkManager ]
+#then
+#      for i in eth0 eth1 eth2 ath0 wlan0
+#      do
+#              grep -q "iface ${i}" ${IFFILE} && continue
+#
+#cat >> "${IFFILE}" << EOF
+#allow-hotplug ${i}
+#iface ${i} inet dhcp
+#
+#EOF
+#
+#      done
+#fi
 
 log_end_msg