Making verify-checksums function self contained.

diff --git a/scripts/boot/0110-cmdline b/scripts/boot/0110-cmdline
index 6486515..087549d 100755 (executable)
--- a/scripts/boot/0110-cmdline
+++ b/scripts/boot/0110-cmdline
@@ -7,10 +7,6 @@ Cmdline ()
        for _PARAMETER in ${_CMDLINE}
        do
                case "${_PARAMETER}" in
-                       live-boot.verify-checksums|verify-checksums)
-                               LIVE_VERIFY_CHECKSUMS="true"
-                               ;;
-
                        # Special options
                        live-boot.debug|debug)
                                LIVE_DEBUG="true"

diff --git a/scripts/boot/3010-verify-checksums b/scripts/boot/3010-verify-checksums
index 7dd5da3..cc4115d 100755 (executable)
--- a/scripts/boot/3010-verify-checksums
+++ b/scripts/boot/3010-verify-checksums
@@ -4,6 +4,20 @@
 
 Verify_checksums ()
 {
+       for _PARAMETER in ${_CMDLINE}
+       do
+               case "${_PARAMETER}" in
+                       live-boot.verify-checksums|verify-checksums)
+                               LIVE_VERIFY_CHECKSUMS="true"
+                               ;;
+               esac
+       done
+
+       if [ "${LIVE_VERIFY_CHECKSUMS}" != "true" ]
+       then
+               return 0
+       fi
+
        _MOUNTPOINT="${1}"
 
        _DIGESTS="sha512 sha384 sha256 sha224 sha1 md5"

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 5be1277..8dcdfe6 100755 (executable)
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -88,11 +88,7 @@ Main ()
                panic "Unable to find a medium containing a live file system"
        fi
 
-       case "${LIVE_VERIFY_CHECKSUMS}" in
-               true)
-                       Verify_checksums "${livefs_root}"
-                       ;;
-       esac
+       Verify_checksums "${livefs_root}"
 
        if [ "${TORAM}" ]
        then