Adding upstream version 3.0~a12.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index 309d5aa..90eca0f 100755 (executable)
--- 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}"