[SCM] live-boot branch, debian-next, updated. debian/3.0_a38-1-13-gab6364d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit ab6364da036b4b09c0e5c92b0e21c4d43e4bd4c2
Author: Steven Shiau <steven at nchc.org.tw>
Date:   Tue Aug 14 20:57:17 2012 +0200

    Adding support for nameserver in ip= boot parameter.

diff --git a/scripts/boot/9990-netbase.sh b/scripts/boot/9990-netbase.sh
index c11b9df..384f3f6 100755
--- a/scripts/boot/9990-netbase.sh
+++ b/scripts/boot/9990-netbase.sh
@@ -16,6 +16,7 @@ Netbase ()
 	log_begin_msg "Preconfiguring networking"
 
 	IFFILE="/root/etc/network/interfaces"
+	DNSFILE="/root/etc/resolv.conf"
 
 	if [ "${STATICIP}" = "frommedia" ] && [ -e "${IFFILE}" ]
 	then
@@ -43,6 +44,7 @@ EOF
 			ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
 			ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"
 			ifgateway="$(echo ${ifline} | cut -f4 -d ':')"
+			nameserver="$(echo ${ifline} | cut -f5 -d ':')"
 
 cat >> "${IFFILE}" << EOF
 allow-hotplug ${ifname}
@@ -60,6 +62,15 @@ cat >> "${IFFILE}" << EOF
 EOF
 
 			fi
+
+			if [ -n "${nameserver}" ]
+			then
+
+cat >> "${DNSFILE}" << EOF
+nameserver ${nameserver}
+EOF
+
+			fi
 		done
 	else
 		if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]

-- 
live-boot