Adding upstream version 3.0~a14.

[live-boot-grml.git] / scripts / live-bottom / 23networking

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 8c856c6..86d4562 100755 (executable)
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -65,10 +65,18 @@ allow-hotplug ${ifname}
 iface ${ifname} inet static
     address ${ifaddress}
     netmask ${ifnetmask}
+EOF
+
+if [ -n "${ifgateway}" ]
+then
+
+cat >> "${IFFILE}" << EOF
     gateway ${ifgateway}
 
 EOF
 
+fi
+
        done
 else
        if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
@@ -81,8 +89,8 @@ else
                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 ])
+       # iterate the physical interfaces and add them to the interfaces list and also add when ethdevice= called on cmdline
+       if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ]) || [ ! -z "${ETHDEVICE}" ]
        then
                for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
                do