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

diff --git a/scripts/live b/scripts/live
index 9460eaa..8e0409a 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1471,7 +1471,8 @@ 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}" ) && \
+				( 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 )
 				;;
@@ -1577,11 +1578,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