X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=86d456213d444cf1430d9bb35b0d0a5868dcdd64;hb=10709960de62ab97b4628a49016d0f46676d61e9;hp=5e9afe94c85ba670685e57292ac63090ca8190d8;hpb=c9d58cf19e1e40db8ee3f529fdcd6a319b156257;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 5e9afe9..86d4562 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NONETWORKING}" ]
 then
@@ -27,9 +27,9 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Preconfiguring networking..."
+log_begin_msg "Preconfiguring networking"
 
-# live-initramfs script
+# live-boot script
 
 IFFILE="/root/etc/network/interfaces"
 
@@ -46,40 +46,40 @@ iface lo inet loopback
 
 EOF
 
-if [ -x /sbin/udevadm ]
-then
-	# lenny
-	udevadm trigger
-	udevadm settle
-else
-	# etch
-	udevtrigger
-	udevsettle
-fi
+udevadm trigger
+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}
+EOF
+
+if [ -n "${ifgateway}" ]
+then
+
+cat >> "${IFFILE}" << EOF
     gateway ${ifgateway}
 
 EOF
 
+fi
+
 	done
 else
-	if [ -z "${NETBOOT}" ]
+	if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
 	then
 		# default, dhcp assigned
 		method="dhcp"
@@ -89,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 ]
+	# 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
@@ -98,7 +98,7 @@ else
 			i="$(basename ${interface})"
 
 cat >> "${IFFILE}" << EOF
-auto ${i}
+allow-hotplug ${i}
 iface ${i} inet ${method}
 
 EOF
@@ -127,7 +127,7 @@ EOF
 
 cat > /root/etc/resolv.conf << EOF
 # /etc/resolv.conf
-# Autogenerated by live-initramfs
+# Autogenerated by live-boot
 search ${rc_search}
 domain ${rc_search}
 ${rc_server0}
@@ -146,7 +146,7 @@ fi
 #		grep -q "iface ${i}" ${IFFILE} && continue
 #
 #cat >> "${IFFILE}" << EOF
-#auto ${i}
+#allow-hotplug ${i}
 #iface ${i} inet dhcp
 #
 #EOF