Rewriting live-media checksum verification to work with any SHA and MD5 digests.

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

diff --git a/scripts/boot/arguments.sh b/scripts/boot/arguments.sh
index e8636ee..f9e8d33 100755 (executable)
--- a/scripts/boot/arguments.sh
+++ b/scripts/boot/arguments.sh
@@ -4,33 +4,25 @@
 
 Arguments ()
 {
-       PRESEEDS=""
-       LOCATIONS=""
-
        for ARGUMENT in $(cat /proc/cmdline)
        do
                case "${ARGUMENT}" in
+                       live-boot.verify-checksums|verify-checksums)
+                               LIVE_VERIFY_CHECKSUMS="true"
+                               export LIVE_VERIFY_CHECKSUMS
+                               ;;
+
+                       # parameters below need review
                        read-only)
                                READ_ONLY="true"
                                ;;
 
                        skipconfig)
-                               NOACCESSIBILITY="true"
                                NOFASTBOOT="true"
                                NOFSTAB="true"
                                NONETWORKING="true"
 
-                               export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
-                               ;;
-
-                       access=*)
-                               ACCESS="${ARGUMENT#access=}"
-                               export ACCESS
-                               ;;
-
-                       console=*)
-                               DEFCONSOLE="${ARGUMENT#*=}"
-                               export DEFCONSOLE
+                               export NOFASTBOOT NOFSTAB NONETWORKING
                                ;;
 
                        BOOTIF=*)
@@ -47,12 +39,13 @@ Arguments ()
                        dhcp)
                                # Force dhcp even while netbooting
                                # Use for debugging in case somebody works on fixing dhclient
-                               DHCP="Force";
+                               DHCP="true";
                                export DHCP
                                ;;
 
                        nodhcp)
-                               unset DHCP
+                               DHCP=""
+                               export DHCP
                                ;;
 
                        ethdevice=*)
@@ -76,11 +69,6 @@ Arguments ()
                                export FINDISO
                                ;;
 
-                       forcepersistencefsck)
-                               FORCEPERSISTENCEFSCK="true"
-                               export FORCEPERSISTENCEFSCK
-                               ;;
-
                        ftpfs=*)
                                FTPFS="${ARGUMENT#ftpfs=}"
                                export FTPFS
@@ -114,11 +102,6 @@ Arguments ()
                                export IGNORE_UUID
                                ;;
 
-                       integrity-check)
-                               INTEGRITY_CHECK="true"
-                               export INTEGRITY_CHECK
-                               ;;
-
                        ip=*)
                                STATICIP="${ARGUMENT#ip=}"
 
@@ -130,11 +113,6 @@ Arguments ()
                                export STATICIP
                                ;;
 
-                       live-getty)
-                               LIVE_GETTY="1"
-                               export LIVE_GETTY
-                               ;;
-
                        live-media=*|bootfrom=*)
                                LIVE_MEDIA="${ARGUMENT#*=}"
                                export LIVE_MEDIA
@@ -180,11 +158,6 @@ Arguments ()
                                export NFS_COW
                                ;;
 
-                       noaccessibility)
-                               NOACCESSIBILITY="true"
-                               export NOACCESSIBILITY
-                               ;;
-
                        nofastboot)
                                NOFASTBOOT="true"
                                export NOFASTBOOT
@@ -271,23 +244,6 @@ Arguments ()
                                export QUICKUSBMODULES
                                ;;
 
-                       preseed/file=*|file=*)
-                               LOCATIONS="${ARGUMENT#*=} ${LOCATIONS}"
-                               export LOCATIONS
-                               ;;
-
-                       nopreseed)
-                               NOPRESEED="true"
-                               export NOPRESEED
-                               ;;
-
-                       */*=*)
-                               question="${ARGUMENT%%=*}"
-                               value="${ARGUMENT#*=}"
-                               PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
-                               export PRESEEDS
-                               ;;
-
                        showmounts)
                                SHOWMOUNTS="true"
                                export SHOWMOUNTS