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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3e6ca002a29e3dd9afeb57084b7bf1c7ce4504ca
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 14 20:58:41 2012 +0200

    Making nameserver assignment from ip= bootparameter work with persistence.

diff --git a/scripts/boot/9990-netbase.sh b/scripts/boot/9990-netbase.sh
index 384f3f6..64e30df 100755
--- a/scripts/boot/9990-netbase.sh
+++ b/scripts/boot/9990-netbase.sh
@@ -65,11 +65,13 @@ EOF
 
 			if [ -n "${nameserver}" ]
 			then
+				if [ -e "${DNSFILE}" ]
+				then
+					grep -v ^nameserver "${DNSFILE}" > "${DNSFILE}.tmp"
+					mv "${DNSFILE}.tmp" "${DNSFILE}"
+				fi
 
-cat >> "${DNSFILE}" << EOF
-nameserver ${nameserver}
-EOF
-
+				echo "nameserver ${nameserver}" >> "${DNSFILE}"
 			fi
 		done
 	else

-- 
live-boot