Adding upstream version 2.0.2.

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

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index d73f63b..8c856c6 100755 (executable)
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -51,17 +51,17 @@ udevadm settle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
 then
-       parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
+       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 ',')"
+               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}
+allow-hotplug ${ifname}
 iface ${ifname} inet static
     address ${ifaddress}
     netmask ${ifnetmask}
@@ -71,7 +71,7 @@ EOF
 
        done
 else
-       if [ -z "${NETBOOT}" ]
+       if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
        then
                # default, dhcp assigned
                method="dhcp"
@@ -90,7 +90,7 @@ else
                        i="$(basename ${interface})"
 
 cat >> "${IFFILE}" << EOF
-auto ${i}
+allow-hotplug ${i}
 iface ${i} inet ${method}
 
 EOF
@@ -138,7 +138,7 @@ fi
 #              grep -q "iface ${i}" ${IFFILE} && continue
 #
 #cat >> "${IFFILE}" << EOF
-#auto ${i}
+#allow-hotplug ${i}
 #iface ${i} inet dhcp
 #
 #EOF