X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=23d0bbcdc677782704ef4609cd32240b60fb7fda;hb=8cd0e7a9e961e73abe47b0d5c11d3c3a9cbdf802;hp=8761bd7d9275e1ab4706e467de8d42937f3d9875;hpb=46639f899c793aa89958331430132d7bc0df691c;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 8761bd7..23d0bbc 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/sendsigs.omit.d
+				pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true )
 				;;
 
 			unionmount)
@@ -1588,6 +1591,7 @@ check_dev ()
 				devname="${loopdevname}"
 			else
 				echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
+			fi
 		fi
 	fi
 
@@ -1941,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"