X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=57a4d322c9521d979675cd63eccff9b70db8405e;hb=967bfeaca7c4f3e28f935b1afbd0cce0878dd559;hp=8e0409a5d43800b89c8088809519fd70fb7f2387;hpb=a95c7bb5841bf9106d3a5cacaf4f926b601babf3;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 8e0409a..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
 
@@ -1473,8 +1476,8 @@ setup_unionfs ()
 				unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
 				( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
 				unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
-					( mkdir -p /dev/.initramfs/varrun
-				pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true )
+					( mkdir -p /run/initramfs
+				pidof unionfs-fuse >> /run/initramfs/sendsigs.omit || true )
 				;;
 
 			unionmount)
@@ -1942,6 +1945,13 @@ mountroot ()
 		log_end_msg
 	fi
 
+	if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+	then
+		log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
+		cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+		log_end_msg
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"