X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=57a4d322c9521d979675cd63eccff9b70db8405e;hb=a9ddc0ac5a7d752ba93cf6fc838db9ec09fc85aa;hp=9460eaa96609c158850011500e1893adbcae79c7;hpb=9049b9cbd7f5efa68dec32963827a1326c39f5f3;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 9460eaa..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
 
@@ -1471,9 +1474,10 @@ setup_unionfs ()
 			unionfs-fuse)
 				unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid"
 				unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
-				( ulimit -n 16384 ; unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
-					( mkdir -p /dev/.initramfs/varrun
-				pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true )
+				( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
+				unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
+					( mkdir -p /run/initramfs
+				pidof unionfs-fuse >> /run/initramfs/sendsigs.omit || true )
 				;;
 
 			unionmount)
@@ -1577,11 +1581,17 @@ check_dev ()
 		then
 			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
 		else
-			mkdir /isofrom
-			mount -t auto "$ISO_DEVICE" /isofrom
-			ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-			loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
-			devname="${loopdevname}"
+			fs_type=$(get_fstype "${ISO_DEVICE}")
+			if is_supported_fs ${fs_type}
+			then
+				mkdir /isofrom
+				mount -t $fs_type "$ISO_DEVICE" /isofrom
+				ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
+				loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+				devname="${loopdevname}"
+			else
+				echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
+			fi
 		fi
 	fi
 
@@ -1935,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"