Fix VTOY_LINUX_REMOUNT option does not work with latest linux kernel version. (#2661...

[Ventoy.git] / INSTALL / grub / checksum.cfg

diff --git a/INSTALL/grub/checksum.cfg b/INSTALL/grub/checksum.cfg
index c373195441eb00e0e49913d4ad4e96bfb75e9c11..df045ec5ff462dbdd45a8f9ae96accd37a8d4487 100644 (file)
--- a/INSTALL/grub/checksum.cfg
+++ b/INSTALL/grub/checksum.cfg
@@ -1,19 +1,16 @@
 
-if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.md5" ]; then
-    set default=0
+unset vtchkdef
+vt_vtoychksum_exist "${VTOY_CHKSUM_FILE_PATH}" 
+
+if [ "$VT_EXIST_MD5" = "1" ]; then
+    if [ -z "$vtchkdef" ]; then
+        set default=0
+        set vtchkdef=1
+    fi
     menuentry "$VTLANG_CHKSUM_MD5_CALC_CHK" --class=checksum_md5 {
-        md5sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-        
-        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.md5" vtReadChecksum
-                
-        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
-            echo -e "\n\nCheck MD5 value with .md5 file.  [ OK ]"
-        else
-            echo -e "\n\nCheck MD5 value with .md5 file.  [ FAIL ]"
-            echo "The MD5 value in .md5 file is:"
-            echo "$vtReadChecksum"
-        fi
-        
+        md5sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"       
+        vt_cmp_checksum 0 "${VTOY_CHKSUM_FILE_PATH}"
+
         echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
     }
@@ -26,20 +23,14 @@ else
     }
 fi
 
-if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha1" ]; then
-    set default=1
+if [ "$VT_EXIST_SHA1" = "1" ]; then
+    if [ -z "$vtchkdef" ]; then
+        set default=1
+        set vtchkdef=1
+    fi
     menuentry "$VTLANG_CHKSUM_SHA1_CALC_CHK" --class=checksum_sha1 {
         sha1sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-        
-        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha1" vtReadChecksum
-        
-        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
-            echo -e "\n\nCheck SHA1 value with .sha1 file.  [ OK ]"
-        else
-            echo -e "\n\nCheck SHA1 value with .sha1 file.  [ FAIL ]"
-            echo "The SHA1 value in .sha1 file is:"
-            echo "$vtReadChecksum"
-        fi
+        vt_cmp_checksum 1 "${VTOY_CHKSUM_FILE_PATH}" 
         
         echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
@@ -55,20 +46,14 @@ fi
 
 
 
-if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha256" ]; then
-    set default=2
+if [ "$VT_EXIST_SHA256" = "1" ]; then
+    if [ -z "$vtchkdef" ]; then
+        set default=2
+        set vtchkdef=1
+    fi
     menuentry "$VTLANG_CHKSUM_SHA256_CALC_CHK" --class=checksum_sha256 {
         sha256sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-        
-        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha256" vtReadChecksum
-        
-        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
-            echo -e "\n\nCheck SHA256 value with .sha256 file.  [ OK ]"
-        else
-            echo -e "\n\nCheck SHA256 value with .sha256 file.  [ FAIL ]"
-            echo "The SHA256 value in .sha256 file is:"
-            echo "$vtReadChecksum"
-        fi
+        vt_cmp_checksum 2 "${VTOY_CHKSUM_FILE_PATH}"         
         
         echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey
@@ -84,20 +69,14 @@ fi
 
 
 
-if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha512" ]; then
-    set default=3
+if [ "$VT_EXIST_SHA512" = "1" ]; then
+    if [ -z "$vtchkdef" ]; then
+        set default=3
+        set vtchkdef=1
+    fi
     menuentry "$VTLANG_CHKSUM_SHA512_CALC_CHK" --class=checksum_sha512{
         sha512sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-        
-        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha512" vtReadChecksum
-        
-        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
-            echo -e "\n\nCheck SHA512 value with .sha512 file.  [ OK ]"
-        else
-            echo -e "\n\nCheck SHA512 value with .sha512 file.  [ FAIL ]"
-            echo "The SHA512 value in .sha512 file is:"
-            echo "$vtReadChecksum"
-        fi
+        vt_cmp_checksum 3 "${VTOY_CHKSUM_FILE_PATH}"        
         
         echo -en "\n\n$VTLANG_ENTER_EXIT ..."
         read vtInputKey