X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=86d456213d444cf1430d9bb35b0d0a5868dcdd64;hb=2d129205223e1fb6322bb03a9cb9fdf1736885b8;hp=aeff35170de276f145b0c58d50e962d9ccdf5154;hpb=6a3e789117d7c4254aee7905e0c3065a5202d79f;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index aeff351..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,51 +27,59 @@ 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"
 
-if [ "${STATICIP}" = "frommedia" -a -e  "$IFFILE" ]
+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
+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}
+cat >> "${IFFILE}" << EOF
+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"
@@ -81,50 +89,53 @@ 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
-			[ -e $interface ] || continue
-			i="$(basename $interface)"
+			[ -e ${interface} ] || continue
+			i="$(basename ${interface})"
 
-cat >> "$IFFILE" << EOF
-auto $i
-iface $i inet $method
+cat >> "${IFFILE}" << EOF
+allow-hotplug ${i}
+iface ${i} inet ${method}
 
 EOF
 
 		done
 	fi
 
-	if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ]
+	if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ]
 	then
-		# create a resolv.conf if it is not present
-		cp /netboot.config /root/var/log/netboot.config
+		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}"
+			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
+			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 live-initramfs
+# 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
+			cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+		fi
 	fi
 fi
 
@@ -132,11 +143,11 @@ fi
 #then
 #	for i in eth0 eth1 eth2 ath0 wlan0
 #	do
-#		grep -q "iface $i" $IFFILE && continue
+#		grep -q "iface ${i}" ${IFFILE} && continue
 #
-#cat >> "$IFFILE" << EOF
-#auto $i
-#iface $i inet dhcp
+#cat >> "${IFFILE}" << EOF
+#allow-hotplug ${i}
+#iface ${i} inet dhcp
 #
 #EOF
 #