This patch enables support for verifying the ISO through bootid=.... bootoption.

[live-boot-grml.git] / components / 9990-cmdline-old

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index 8bb8254..cccd8f2 100755 (executable)
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -18,6 +18,11 @@ Cmdline_old ()
                                BOOTIF="${_PARAMETER#BOOTIF=}"
                                ;;
 
+                       bootid=*)
+                               BOOTID="${_PARAMETER#bootid=}"
+                               export BOOTID
+                               ;;
+
                        dhcp)
                                # Force dhcp even while netbooting
                                # Use for debugging in case somebody works on fixing dhclient
@@ -79,6 +84,11 @@ Cmdline_old ()
                                export FROMISO
                                ;;
 
+                       ignore_bootid)
+                               IGNORE_BOOTID="Yes"
+                               export IGNORE_BOOTID
+                               ;;
+
                        ignore_uuid)
                                IGNORE_UUID="true"
                                export IGNORE_UUID
@@ -266,7 +276,7 @@ Cmdline_old ()
 
        if [ -z "${UNIONTYPE}" ]
        then
-               UNIONTYPE="aufs"
+               UNIONTYPE="overlay"
                export UNIONTYPE
        fi
 
@@ -285,7 +295,7 @@ Cmdline_old ()
 
                if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
                then
-                       log_warning_msg "cryptsetup in unavailable"
+                       log_warning_msg "cryptsetup is unavailable"
                        PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
                        export PERSISTENCE_ENCRYPTION
                fi