X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=90eca0f54d80b3f95e06194ea554d4b8524bb73d;hb=1e75f8e9e9704dbf9f50f4520b592c93308e3b04;hp=309d5aa0f91ca0c848d9937b0468f9c2e2347b14;hpb=50e62e68f3af64d70bb572e868108d073ffdcb54;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 309d5aa..90eca0f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -266,6 +266,16 @@ Arguments ()
 				export NOPERSISTENT
 				;;
 
+			noprompt)
+				NOPROMPT="Yes"
+				export NOPROMPT
+				;;
+
+			noprompt=*)
+				NOPROMPT="${ARGUMENT#noprompt=}"
+				export NOPROMPT
+				;;
+
 			quickusbmodules)
 				QUICKUSBMODULES="Yes"
 				export QUICKUSBMODULES
@@ -325,9 +335,9 @@ Arguments ()
 				;;
 
 			skipunion)
-                                SKIP_UNION_MOUNTS="Yes"
-                                export SKIP_UNION_MOUNTS
-                                ;;
+				SKIP_UNION_MOUNTS="Yes"
+				export SKIP_UNION_MOUNTS
+				;;
 
 			root=*)
 				ROOT="${ARGUMENT#root=}"
@@ -1546,7 +1556,7 @@ check_dev ()
 			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
 		else
 			mkdir /isofrom
-			mount "$ISO_DEVICE" /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}"