[SCM] live-boot branch, debian-next, updated. debian/3.0_a16-1-7-g483ffee

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 483ffeeb6a25e33037adb7148dbeb15dd6dfdd57
Author: Michal Suchanek <hramrach at centrum.cz>
Date:   Tue May 17 19:55:57 2011 +0200

    Tidy up resolv.conf a bit.

diff --git a/scripts/live b/scripts/live
index 76be7ae..57a4d32 100755
--- a/scripts/live
+++ b/scripts/live
@@ -730,12 +730,15 @@ do_netsetup ()
 			if [ -n "${DNSDOMAIN}" ]
 			then
 				echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
-				echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
 			fi
 
 			for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
 			do
-				echo "nameserver $i" >> /etc/resolv.conf
+				if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+				then
+					echo "nameserver $i" >> /etc/resolv.conf
+				fi
 			done
 		fi
 

-- 
live-boot