From: longpanda <admin@ventoy.net>
Date: Mon, 11 Oct 2021 13:11:52 +0000 (+0800)
Subject: Add support for 小鱼儿yr系统维护PE
X-Git-Tag: v1.0.54~3
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/c18399e8b43f34a96a066dff06e6a884009af7e2?ds=sidebyside

Add support for 小鱼儿yr系统维护PE
---

diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
index b7e7ce0..df1cce7 100644
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
@@ -5087,6 +5087,7 @@ static cmd_para ventoy_cmds[] =
     { "vt_check_json_path_case", ventoy_cmd_chk_json_pathcase, 0, NULL, "", "", NULL },
     { "vt_append_extra_sector", ventoy_cmd_append_ext_sector, 0, NULL, "", "", NULL },
     { "gptpriority", grub_cmd_gptpriority, 0, NULL, "", "", NULL },
+    { "vt_wim_peset", ventoy_cmd_wim_peset, 0, NULL, "", "", NULL },
 };
 
 int ventoy_register_all_cmd(void)
diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
index 44fdc80..670ae56 100644
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
@@ -586,6 +586,7 @@ grub_err_t ventoy_cmd_is_pe64(grub_extcmd_context_t ctxt, int argc, char **args)
 grub_err_t ventoy_cmd_windows_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_windows_wimboot_data(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wim_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
+grub_err_t ventoy_cmd_wim_peset(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wim_check_bootable(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_dump_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_sel_wimboot(grub_extcmd_context_t ctxt, int argc, char **args);
diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c
index 9f7615c..69f3fea 100644
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c
@@ -40,6 +40,7 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
+static int g_peset_flag = 0;
 static int g_iso_fs_type = 0;
 static int g_wim_total_patch_count = 0;
 static int g_wim_valid_patch_count = 0;
@@ -417,6 +418,7 @@ grub_err_t ventoy_cmd_wimdows_reset(grub_extcmd_context_t ctxt, int argc, char *
     g_wim_patch_head = NULL;
     g_wim_total_patch_count = 0;
     g_wim_valid_patch_count = 0;
+    g_peset_flag = 0;
 
     return 0;
 }
@@ -660,7 +662,9 @@ static wim_directory_entry * search_full_wim_dirent
 
 static wim_directory_entry * search_replace_wim_dirent(void *meta_data, wim_directory_entry *dir)
 {
+    wim_directory_entry *tmp_dirent = NULL;
     wim_directory_entry *wim_dirent = NULL;
+    const char *peset_path[] = { "Windows", "System32", "peset.exe", NULL };
     const char *pecmd_path[] = { "Windows", "System32", "pecmd.exe", NULL };
     const char *winpeshl_path[] = { "Windows", "System32", "winpeshl.exe", NULL };
 
@@ -668,6 +672,16 @@ static wim_directory_entry * search_replace_wim_dirent(void *meta_data, wim_dire
     debug("search pecmd.exe %p\n", wim_dirent);
     if (wim_dirent)
     {
+        if (g_peset_flag)
+        {
+            tmp_dirent = search_full_wim_dirent(meta_data, dir, peset_path);
+            debug("search peset.exe %p\n", tmp_dirent);
+            if (tmp_dirent)
+            {
+                return tmp_dirent;
+            }
+        }
+
         return wim_dirent;
     }
 
@@ -1829,6 +1843,17 @@ grub_err_t ventoy_cmd_wim_check_bootable(grub_extcmd_context_t ctxt, int argc, c
     VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
 
+grub_err_t ventoy_cmd_wim_peset(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    (void)ctxt;
+    (void)argc;
+    (void)args;
+    
+    g_peset_flag = 1;
+
+    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
+}
+
 grub_err_t ventoy_cmd_wim_chain_data(grub_extcmd_context_t ctxt, int argc, char **args)
 {
     grub_uint32_t i = 0;
diff --git a/INSTALL/grub/arm64-efi/adler32.mod b/INSTALL/grub/arm64-efi/adler32.mod
index 1793768..806c5da 100644
Binary files a/INSTALL/grub/arm64-efi/adler32.mod and b/INSTALL/grub/arm64-efi/adler32.mod differ
diff --git a/INSTALL/grub/arm64-efi/affs.mod b/INSTALL/grub/arm64-efi/affs.mod
index b41d87d..4656e87 100644
Binary files a/INSTALL/grub/arm64-efi/affs.mod and b/INSTALL/grub/arm64-efi/affs.mod differ
diff --git a/INSTALL/grub/arm64-efi/afs.mod b/INSTALL/grub/arm64-efi/afs.mod
index d84f2d2..e8982a9 100644
Binary files a/INSTALL/grub/arm64-efi/afs.mod and b/INSTALL/grub/arm64-efi/afs.mod differ
diff --git a/INSTALL/grub/arm64-efi/archelp.mod b/INSTALL/grub/arm64-efi/archelp.mod
index 30241df..c4729ba 100644
Binary files a/INSTALL/grub/arm64-efi/archelp.mod and b/INSTALL/grub/arm64-efi/archelp.mod differ
diff --git a/INSTALL/grub/arm64-efi/bfs.mod b/INSTALL/grub/arm64-efi/bfs.mod
index db60086..e24a099 100644
Binary files a/INSTALL/grub/arm64-efi/bfs.mod and b/INSTALL/grub/arm64-efi/bfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/blscfg.mod b/INSTALL/grub/arm64-efi/blscfg.mod
index 9b42d3d..26112ee 100644
Binary files a/INSTALL/grub/arm64-efi/blscfg.mod and b/INSTALL/grub/arm64-efi/blscfg.mod differ
diff --git a/INSTALL/grub/arm64-efi/bswap_test.mod b/INSTALL/grub/arm64-efi/bswap_test.mod
index fd5ab45..9435014 100644
Binary files a/INSTALL/grub/arm64-efi/bswap_test.mod and b/INSTALL/grub/arm64-efi/bswap_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/btrfs.mod b/INSTALL/grub/arm64-efi/btrfs.mod
index 1669205..6dbb181 100644
Binary files a/INSTALL/grub/arm64-efi/btrfs.mod and b/INSTALL/grub/arm64-efi/btrfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/cbfs.mod b/INSTALL/grub/arm64-efi/cbfs.mod
index f700ae6..a59d1c0 100644
Binary files a/INSTALL/grub/arm64-efi/cbfs.mod and b/INSTALL/grub/arm64-efi/cbfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/cmdline_cat_test.mod b/INSTALL/grub/arm64-efi/cmdline_cat_test.mod
index 3b0f38a..cbdca10 100644
Binary files a/INSTALL/grub/arm64-efi/cmdline_cat_test.mod and b/INSTALL/grub/arm64-efi/cmdline_cat_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/cmp.mod b/INSTALL/grub/arm64-efi/cmp.mod
index a7d9210..d392b47 100644
Binary files a/INSTALL/grub/arm64-efi/cmp.mod and b/INSTALL/grub/arm64-efi/cmp.mod differ
diff --git a/INSTALL/grub/arm64-efi/cmp_test.mod b/INSTALL/grub/arm64-efi/cmp_test.mod
index f70cca2..51164f4 100644
Binary files a/INSTALL/grub/arm64-efi/cmp_test.mod and b/INSTALL/grub/arm64-efi/cmp_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/command.lst b/INSTALL/grub/arm64-efi/command.lst
index 23f101c..743d255 100644
Binary files a/INSTALL/grub/arm64-efi/command.lst and b/INSTALL/grub/arm64-efi/command.lst differ
diff --git a/INSTALL/grub/arm64-efi/cpio.mod b/INSTALL/grub/arm64-efi/cpio.mod
index f7d966c..541fe71 100644
Binary files a/INSTALL/grub/arm64-efi/cpio.mod and b/INSTALL/grub/arm64-efi/cpio.mod differ
diff --git a/INSTALL/grub/arm64-efi/cpio_be.mod b/INSTALL/grub/arm64-efi/cpio_be.mod
index 5e90c17..db0c096 100644
Binary files a/INSTALL/grub/arm64-efi/cpio_be.mod and b/INSTALL/grub/arm64-efi/cpio_be.mod differ
diff --git a/INSTALL/grub/arm64-efi/crc64.mod b/INSTALL/grub/arm64-efi/crc64.mod
index 8b084f1..57c0e17 100644
Binary files a/INSTALL/grub/arm64-efi/crc64.mod and b/INSTALL/grub/arm64-efi/crc64.mod differ
diff --git a/INSTALL/grub/arm64-efi/crypto.lst b/INSTALL/grub/arm64-efi/crypto.lst
index 77d9efc..bd0a97c 100644
Binary files a/INSTALL/grub/arm64-efi/crypto.lst and b/INSTALL/grub/arm64-efi/crypto.lst differ
diff --git a/INSTALL/grub/arm64-efi/cryptodisk.mod b/INSTALL/grub/arm64-efi/cryptodisk.mod
index 1eac1a0..ec574a2 100644
Binary files a/INSTALL/grub/arm64-efi/cryptodisk.mod and b/INSTALL/grub/arm64-efi/cryptodisk.mod differ
diff --git a/INSTALL/grub/arm64-efi/ctz_test.mod b/INSTALL/grub/arm64-efi/ctz_test.mod
index 626f0c3..f1a6a7e 100644
Binary files a/INSTALL/grub/arm64-efi/ctz_test.mod and b/INSTALL/grub/arm64-efi/ctz_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/date.mod b/INSTALL/grub/arm64-efi/date.mod
index 16ec064..aaf9248 100644
Binary files a/INSTALL/grub/arm64-efi/date.mod and b/INSTALL/grub/arm64-efi/date.mod differ
diff --git a/INSTALL/grub/arm64-efi/datehook.mod b/INSTALL/grub/arm64-efi/datehook.mod
index c8479fa..9817cbe 100644
Binary files a/INSTALL/grub/arm64-efi/datehook.mod and b/INSTALL/grub/arm64-efi/datehook.mod differ
diff --git a/INSTALL/grub/arm64-efi/disk.mod b/INSTALL/grub/arm64-efi/disk.mod
index 493ae1e..bdc2c8b 100644
Binary files a/INSTALL/grub/arm64-efi/disk.mod and b/INSTALL/grub/arm64-efi/disk.mod differ
diff --git a/INSTALL/grub/arm64-efi/div.mod b/INSTALL/grub/arm64-efi/div.mod
index 07f9731..281406f 100644
Binary files a/INSTALL/grub/arm64-efi/div.mod and b/INSTALL/grub/arm64-efi/div.mod differ
diff --git a/INSTALL/grub/arm64-efi/div_test.mod b/INSTALL/grub/arm64-efi/div_test.mod
index c30473f..d79e6cf 100644
Binary files a/INSTALL/grub/arm64-efi/div_test.mod and b/INSTALL/grub/arm64-efi/div_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/dm_nv.mod b/INSTALL/grub/arm64-efi/dm_nv.mod
index 0da0150..089b613 100644
Binary files a/INSTALL/grub/arm64-efi/dm_nv.mod and b/INSTALL/grub/arm64-efi/dm_nv.mod differ
diff --git a/INSTALL/grub/arm64-efi/efinet.mod b/INSTALL/grub/arm64-efi/efinet.mod
index 941db7d..6aa4d86 100644
Binary files a/INSTALL/grub/arm64-efi/efinet.mod and b/INSTALL/grub/arm64-efi/efinet.mod differ
diff --git a/INSTALL/grub/arm64-efi/elf.mod b/INSTALL/grub/arm64-efi/elf.mod
index 2295914..88ce4ab 100644
Binary files a/INSTALL/grub/arm64-efi/elf.mod and b/INSTALL/grub/arm64-efi/elf.mod differ
diff --git a/INSTALL/grub/arm64-efi/eval.mod b/INSTALL/grub/arm64-efi/eval.mod
index 3cd9d09..370f3a4 100644
Binary files a/INSTALL/grub/arm64-efi/eval.mod and b/INSTALL/grub/arm64-efi/eval.mod differ
diff --git a/INSTALL/grub/arm64-efi/exfctest.mod b/INSTALL/grub/arm64-efi/exfctest.mod
index 62278bd..a8b3cd2 100644
Binary files a/INSTALL/grub/arm64-efi/exfctest.mod and b/INSTALL/grub/arm64-efi/exfctest.mod differ
diff --git a/INSTALL/grub/arm64-efi/f2fs.mod b/INSTALL/grub/arm64-efi/f2fs.mod
index 73dc88b..eb62b75 100644
Binary files a/INSTALL/grub/arm64-efi/f2fs.mod and b/INSTALL/grub/arm64-efi/f2fs.mod differ
diff --git a/INSTALL/grub/arm64-efi/fdt.lst b/INSTALL/grub/arm64-efi/fdt.lst
index e69de29..ea28d9e 100644
Binary files a/INSTALL/grub/arm64-efi/fdt.lst and b/INSTALL/grub/arm64-efi/fdt.lst differ
diff --git a/INSTALL/grub/arm64-efi/fdt.mod b/INSTALL/grub/arm64-efi/fdt.mod
index d295efe..1c8029e 100644
Binary files a/INSTALL/grub/arm64-efi/fdt.mod and b/INSTALL/grub/arm64-efi/fdt.mod differ
diff --git a/INSTALL/grub/arm64-efi/fs.lst b/INSTALL/grub/arm64-efi/fs.lst
index 0acd240..12c6c9d 100644
Binary files a/INSTALL/grub/arm64-efi/fs.lst and b/INSTALL/grub/arm64-efi/fs.lst differ
diff --git a/INSTALL/grub/arm64-efi/functional_test.mod b/INSTALL/grub/arm64-efi/functional_test.mod
index 2db9633..bab2b83 100644
Binary files a/INSTALL/grub/arm64-efi/functional_test.mod and b/INSTALL/grub/arm64-efi/functional_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_arcfour.mod b/INSTALL/grub/arm64-efi/gcry_arcfour.mod
index e78d071..fa6a146 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_arcfour.mod and b/INSTALL/grub/arm64-efi/gcry_arcfour.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_blowfish.mod b/INSTALL/grub/arm64-efi/gcry_blowfish.mod
index fe2c3a9..71c1e56 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_blowfish.mod and b/INSTALL/grub/arm64-efi/gcry_blowfish.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_camellia.mod b/INSTALL/grub/arm64-efi/gcry_camellia.mod
index 6c259ae..ff60824 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_camellia.mod and b/INSTALL/grub/arm64-efi/gcry_camellia.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_cast5.mod b/INSTALL/grub/arm64-efi/gcry_cast5.mod
index cb0f5de..779c31e 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_cast5.mod and b/INSTALL/grub/arm64-efi/gcry_cast5.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_crc.mod b/INSTALL/grub/arm64-efi/gcry_crc.mod
index ae0a461..072c484 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_crc.mod and b/INSTALL/grub/arm64-efi/gcry_crc.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_des.mod b/INSTALL/grub/arm64-efi/gcry_des.mod
index 49e0723..1d12ed0 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_des.mod and b/INSTALL/grub/arm64-efi/gcry_des.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_dsa.mod b/INSTALL/grub/arm64-efi/gcry_dsa.mod
index cfceba7..4288cd4 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_dsa.mod and b/INSTALL/grub/arm64-efi/gcry_dsa.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_idea.mod b/INSTALL/grub/arm64-efi/gcry_idea.mod
index 8a1e492..03b17d8 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_idea.mod and b/INSTALL/grub/arm64-efi/gcry_idea.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_md4.mod b/INSTALL/grub/arm64-efi/gcry_md4.mod
index 514efcf..b84b1f3 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_md4.mod and b/INSTALL/grub/arm64-efi/gcry_md4.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_rfc2268.mod b/INSTALL/grub/arm64-efi/gcry_rfc2268.mod
index 8f2bd3e..633ee22 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_rfc2268.mod and b/INSTALL/grub/arm64-efi/gcry_rfc2268.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_rijndael.mod b/INSTALL/grub/arm64-efi/gcry_rijndael.mod
index 272b6bb..721eaa0 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_rijndael.mod and b/INSTALL/grub/arm64-efi/gcry_rijndael.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_rmd160.mod b/INSTALL/grub/arm64-efi/gcry_rmd160.mod
index 04827ec..3688d8b 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_rmd160.mod and b/INSTALL/grub/arm64-efi/gcry_rmd160.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_rsa.mod b/INSTALL/grub/arm64-efi/gcry_rsa.mod
index 50ffc9d..e33a0fe 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_rsa.mod and b/INSTALL/grub/arm64-efi/gcry_rsa.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_seed.mod b/INSTALL/grub/arm64-efi/gcry_seed.mod
index 95611c1..636bc99 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_seed.mod and b/INSTALL/grub/arm64-efi/gcry_seed.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_serpent.mod b/INSTALL/grub/arm64-efi/gcry_serpent.mod
index abfe571..70c3257 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_serpent.mod and b/INSTALL/grub/arm64-efi/gcry_serpent.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_sha1.mod b/INSTALL/grub/arm64-efi/gcry_sha1.mod
index 60c1aab..55eeb12 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_sha1.mod and b/INSTALL/grub/arm64-efi/gcry_sha1.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_sha256.mod b/INSTALL/grub/arm64-efi/gcry_sha256.mod
index b592e9e..b00f799 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_sha256.mod and b/INSTALL/grub/arm64-efi/gcry_sha256.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_tiger.mod b/INSTALL/grub/arm64-efi/gcry_tiger.mod
index 8795df3..ec6a983 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_tiger.mod and b/INSTALL/grub/arm64-efi/gcry_tiger.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_twofish.mod b/INSTALL/grub/arm64-efi/gcry_twofish.mod
index fb2a6c9..1ce7bb2 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_twofish.mod and b/INSTALL/grub/arm64-efi/gcry_twofish.mod differ
diff --git a/INSTALL/grub/arm64-efi/gcry_whirlpool.mod b/INSTALL/grub/arm64-efi/gcry_whirlpool.mod
index e77346e..885a3ce 100644
Binary files a/INSTALL/grub/arm64-efi/gcry_whirlpool.mod and b/INSTALL/grub/arm64-efi/gcry_whirlpool.mod differ
diff --git a/INSTALL/grub/arm64-efi/geli.mod b/INSTALL/grub/arm64-efi/geli.mod
index 6aeb5bf..74835b1 100644
Binary files a/INSTALL/grub/arm64-efi/geli.mod and b/INSTALL/grub/arm64-efi/geli.mod differ
diff --git a/INSTALL/grub/arm64-efi/gfxterm_menu.mod b/INSTALL/grub/arm64-efi/gfxterm_menu.mod
index 0a2f103..3608436 100644
Binary files a/INSTALL/grub/arm64-efi/gfxterm_menu.mod and b/INSTALL/grub/arm64-efi/gfxterm_menu.mod differ
diff --git a/INSTALL/grub/arm64-efi/gptsync.mod b/INSTALL/grub/arm64-efi/gptsync.mod
index 17924d5..7a2f95f 100644
Binary files a/INSTALL/grub/arm64-efi/gptsync.mod and b/INSTALL/grub/arm64-efi/gptsync.mod differ
diff --git a/INSTALL/grub/arm64-efi/hello.mod b/INSTALL/grub/arm64-efi/hello.mod
index 459aaa3..cd60a48 100644
Binary files a/INSTALL/grub/arm64-efi/hello.mod and b/INSTALL/grub/arm64-efi/hello.mod differ
diff --git a/INSTALL/grub/arm64-efi/help.mod b/INSTALL/grub/arm64-efi/help.mod
index 81c4bb5..a12f6e2 100644
Binary files a/INSTALL/grub/arm64-efi/help.mod and b/INSTALL/grub/arm64-efi/help.mod differ
diff --git a/INSTALL/grub/arm64-efi/hexdump.mod b/INSTALL/grub/arm64-efi/hexdump.mod
index 65c4883..3018a84 100644
Binary files a/INSTALL/grub/arm64-efi/hexdump.mod and b/INSTALL/grub/arm64-efi/hexdump.mod differ
diff --git a/INSTALL/grub/arm64-efi/hfs.mod b/INSTALL/grub/arm64-efi/hfs.mod
index a0c1c31..728d259 100644
Binary files a/INSTALL/grub/arm64-efi/hfs.mod and b/INSTALL/grub/arm64-efi/hfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/hfspluscomp.mod b/INSTALL/grub/arm64-efi/hfspluscomp.mod
index ebc5b18..bbeca9d 100644
Binary files a/INSTALL/grub/arm64-efi/hfspluscomp.mod and b/INSTALL/grub/arm64-efi/hfspluscomp.mod differ
diff --git a/INSTALL/grub/arm64-efi/jfs.mod b/INSTALL/grub/arm64-efi/jfs.mod
index b48ca1c..aebbdd1 100644
Binary files a/INSTALL/grub/arm64-efi/jfs.mod and b/INSTALL/grub/arm64-efi/jfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/keystatus.mod b/INSTALL/grub/arm64-efi/keystatus.mod
index 24e9708..a228443 100644
Binary files a/INSTALL/grub/arm64-efi/keystatus.mod and b/INSTALL/grub/arm64-efi/keystatus.mod differ
diff --git a/INSTALL/grub/arm64-efi/ldm.mod b/INSTALL/grub/arm64-efi/ldm.mod
index 95e626b..d7ba301 100644
Binary files a/INSTALL/grub/arm64-efi/ldm.mod and b/INSTALL/grub/arm64-efi/ldm.mod differ
diff --git a/INSTALL/grub/arm64-efi/loadenv.mod b/INSTALL/grub/arm64-efi/loadenv.mod
index 996730c..8c6a2a8 100644
Binary files a/INSTALL/grub/arm64-efi/loadenv.mod and b/INSTALL/grub/arm64-efi/loadenv.mod differ
diff --git a/INSTALL/grub/arm64-efi/lsacpi.mod b/INSTALL/grub/arm64-efi/lsacpi.mod
index 9915a64..841862f 100644
Binary files a/INSTALL/grub/arm64-efi/lsacpi.mod and b/INSTALL/grub/arm64-efi/lsacpi.mod differ
diff --git a/INSTALL/grub/arm64-efi/lsefi.mod b/INSTALL/grub/arm64-efi/lsefi.mod
index 56e709d..3d48f26 100644
Binary files a/INSTALL/grub/arm64-efi/lsefi.mod and b/INSTALL/grub/arm64-efi/lsefi.mod differ
diff --git a/INSTALL/grub/arm64-efi/lsefimmap.mod b/INSTALL/grub/arm64-efi/lsefimmap.mod
index 815e3da..2fe1126 100644
Binary files a/INSTALL/grub/arm64-efi/lsefimmap.mod and b/INSTALL/grub/arm64-efi/lsefimmap.mod differ
diff --git a/INSTALL/grub/arm64-efi/lsefisystab.mod b/INSTALL/grub/arm64-efi/lsefisystab.mod
index 64831e1..571f4ae 100644
Binary files a/INSTALL/grub/arm64-efi/lsefisystab.mod and b/INSTALL/grub/arm64-efi/lsefisystab.mod differ
diff --git a/INSTALL/grub/arm64-efi/lsmmap.mod b/INSTALL/grub/arm64-efi/lsmmap.mod
index 98b8499..813af7f 100644
Binary files a/INSTALL/grub/arm64-efi/lsmmap.mod and b/INSTALL/grub/arm64-efi/lsmmap.mod differ
diff --git a/INSTALL/grub/arm64-efi/lssal.mod b/INSTALL/grub/arm64-efi/lssal.mod
index 435c5a9..e80f9ae 100644
Binary files a/INSTALL/grub/arm64-efi/lssal.mod and b/INSTALL/grub/arm64-efi/lssal.mod differ
diff --git a/INSTALL/grub/arm64-efi/luks.mod b/INSTALL/grub/arm64-efi/luks.mod
index 24c3974..8f9e6c4 100644
Binary files a/INSTALL/grub/arm64-efi/luks.mod and b/INSTALL/grub/arm64-efi/luks.mod differ
diff --git a/INSTALL/grub/arm64-efi/lvm.mod b/INSTALL/grub/arm64-efi/lvm.mod
index dd08744..ab681fe 100644
Binary files a/INSTALL/grub/arm64-efi/lvm.mod and b/INSTALL/grub/arm64-efi/lvm.mod differ
diff --git a/INSTALL/grub/arm64-efi/macbless.mod b/INSTALL/grub/arm64-efi/macbless.mod
index 970030b..ce130c8 100644
Binary files a/INSTALL/grub/arm64-efi/macbless.mod and b/INSTALL/grub/arm64-efi/macbless.mod differ
diff --git a/INSTALL/grub/arm64-efi/macho.mod b/INSTALL/grub/arm64-efi/macho.mod
index 2b09206..109f49f 100644
Binary files a/INSTALL/grub/arm64-efi/macho.mod and b/INSTALL/grub/arm64-efi/macho.mod differ
diff --git a/INSTALL/grub/arm64-efi/mdraid09.mod b/INSTALL/grub/arm64-efi/mdraid09.mod
index 82044c8..250059d 100644
Binary files a/INSTALL/grub/arm64-efi/mdraid09.mod and b/INSTALL/grub/arm64-efi/mdraid09.mod differ
diff --git a/INSTALL/grub/arm64-efi/mdraid09_be.mod b/INSTALL/grub/arm64-efi/mdraid09_be.mod
index ec9e183..85a250a 100644
Binary files a/INSTALL/grub/arm64-efi/mdraid09_be.mod and b/INSTALL/grub/arm64-efi/mdraid09_be.mod differ
diff --git a/INSTALL/grub/arm64-efi/mdraid1x.mod b/INSTALL/grub/arm64-efi/mdraid1x.mod
index dc3c11c..7c32ded 100644
Binary files a/INSTALL/grub/arm64-efi/mdraid1x.mod and b/INSTALL/grub/arm64-efi/mdraid1x.mod differ
diff --git a/INSTALL/grub/arm64-efi/memdisk.mod b/INSTALL/grub/arm64-efi/memdisk.mod
index 6e48df2..c2b769e 100644
Binary files a/INSTALL/grub/arm64-efi/memdisk.mod and b/INSTALL/grub/arm64-efi/memdisk.mod differ
diff --git a/INSTALL/grub/arm64-efi/memrw.mod b/INSTALL/grub/arm64-efi/memrw.mod
index b7d7751..760d644 100644
Binary files a/INSTALL/grub/arm64-efi/memrw.mod and b/INSTALL/grub/arm64-efi/memrw.mod differ
diff --git a/INSTALL/grub/arm64-efi/minix.mod b/INSTALL/grub/arm64-efi/minix.mod
index a22a811..b695946 100644
Binary files a/INSTALL/grub/arm64-efi/minix.mod and b/INSTALL/grub/arm64-efi/minix.mod differ
diff --git a/INSTALL/grub/arm64-efi/minix2.mod b/INSTALL/grub/arm64-efi/minix2.mod
index b5e18f4..01775e8 100644
Binary files a/INSTALL/grub/arm64-efi/minix2.mod and b/INSTALL/grub/arm64-efi/minix2.mod differ
diff --git a/INSTALL/grub/arm64-efi/minix2_be.mod b/INSTALL/grub/arm64-efi/minix2_be.mod
index 56066e8..f8cf8f7 100644
Binary files a/INSTALL/grub/arm64-efi/minix2_be.mod and b/INSTALL/grub/arm64-efi/minix2_be.mod differ
diff --git a/INSTALL/grub/arm64-efi/minix3.mod b/INSTALL/grub/arm64-efi/minix3.mod
index f6e3337..0c61d0b 100644
Binary files a/INSTALL/grub/arm64-efi/minix3.mod and b/INSTALL/grub/arm64-efi/minix3.mod differ
diff --git a/INSTALL/grub/arm64-efi/minix3_be.mod b/INSTALL/grub/arm64-efi/minix3_be.mod
index df5f6da..91843b8 100644
Binary files a/INSTALL/grub/arm64-efi/minix3_be.mod and b/INSTALL/grub/arm64-efi/minix3_be.mod differ
diff --git a/INSTALL/grub/arm64-efi/minix_be.mod b/INSTALL/grub/arm64-efi/minix_be.mod
index f3e4eeb..0dc4c2a 100644
Binary files a/INSTALL/grub/arm64-efi/minix_be.mod and b/INSTALL/grub/arm64-efi/minix_be.mod differ
diff --git a/INSTALL/grub/arm64-efi/moddep.lst b/INSTALL/grub/arm64-efi/moddep.lst
index bc26700..1a4cafc 100644
Binary files a/INSTALL/grub/arm64-efi/moddep.lst and b/INSTALL/grub/arm64-efi/moddep.lst differ
diff --git a/INSTALL/grub/arm64-efi/mpi.mod b/INSTALL/grub/arm64-efi/mpi.mod
index 10dea4d..d862e7c 100644
Binary files a/INSTALL/grub/arm64-efi/mpi.mod and b/INSTALL/grub/arm64-efi/mpi.mod differ
diff --git a/INSTALL/grub/arm64-efi/msdospart.mod b/INSTALL/grub/arm64-efi/msdospart.mod
index a3f545e..cafa47e 100644
Binary files a/INSTALL/grub/arm64-efi/msdospart.mod and b/INSTALL/grub/arm64-efi/msdospart.mod differ
diff --git a/INSTALL/grub/arm64-efi/mul_test.mod b/INSTALL/grub/arm64-efi/mul_test.mod
index 0c554df..7d27403 100644
Binary files a/INSTALL/grub/arm64-efi/mul_test.mod and b/INSTALL/grub/arm64-efi/mul_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/nilfs2.mod b/INSTALL/grub/arm64-efi/nilfs2.mod
index 51f727a..0742bc8 100644
Binary files a/INSTALL/grub/arm64-efi/nilfs2.mod and b/INSTALL/grub/arm64-efi/nilfs2.mod differ
diff --git a/INSTALL/grub/arm64-efi/normal.mod b/INSTALL/grub/arm64-efi/normal.mod
index 3eabbc4..a2557d4 100644
Binary files a/INSTALL/grub/arm64-efi/normal.mod and b/INSTALL/grub/arm64-efi/normal.mod differ
diff --git a/INSTALL/grub/arm64-efi/ntfscomp.mod b/INSTALL/grub/arm64-efi/ntfscomp.mod
index 28f7fd4..1d197b7 100644
Binary files a/INSTALL/grub/arm64-efi/ntfscomp.mod and b/INSTALL/grub/arm64-efi/ntfscomp.mod differ
diff --git a/INSTALL/grub/arm64-efi/odc.mod b/INSTALL/grub/arm64-efi/odc.mod
index e5ad8c6..c7c13fb 100644
Binary files a/INSTALL/grub/arm64-efi/odc.mod and b/INSTALL/grub/arm64-efi/odc.mod differ
diff --git a/INSTALL/grub/arm64-efi/offsetio.mod b/INSTALL/grub/arm64-efi/offsetio.mod
index a6a9b17..e9eba9f 100644
Binary files a/INSTALL/grub/arm64-efi/offsetio.mod and b/INSTALL/grub/arm64-efi/offsetio.mod differ
diff --git a/INSTALL/grub/arm64-efi/part_acorn.mod b/INSTALL/grub/arm64-efi/part_acorn.mod
index 00f1bcf..eddef74 100644
Binary files a/INSTALL/grub/arm64-efi/part_acorn.mod and b/INSTALL/grub/arm64-efi/part_acorn.mod differ
diff --git a/INSTALL/grub/arm64-efi/part_amiga.mod b/INSTALL/grub/arm64-efi/part_amiga.mod
index 6efa51f..eb05470 100644
Binary files a/INSTALL/grub/arm64-efi/part_amiga.mod and b/INSTALL/grub/arm64-efi/part_amiga.mod differ
diff --git a/INSTALL/grub/arm64-efi/part_bsd.mod b/INSTALL/grub/arm64-efi/part_bsd.mod
index 67303ff..e9fa701 100644
Binary files a/INSTALL/grub/arm64-efi/part_bsd.mod and b/INSTALL/grub/arm64-efi/part_bsd.mod differ
diff --git a/INSTALL/grub/arm64-efi/part_dfly.mod b/INSTALL/grub/arm64-efi/part_dfly.mod
index fe8deac..f88550b 100644
Binary files a/INSTALL/grub/arm64-efi/part_dfly.mod and b/INSTALL/grub/arm64-efi/part_dfly.mod differ
diff --git a/INSTALL/grub/arm64-efi/part_dvh.mod b/INSTALL/grub/arm64-efi/part_dvh.mod
index 46c5d03..48da642 100644
Binary files a/INSTALL/grub/arm64-efi/part_dvh.mod and b/INSTALL/grub/arm64-efi/part_dvh.mod differ
diff --git a/INSTALL/grub/arm64-efi/part_plan.mod b/INSTALL/grub/arm64-efi/part_plan.mod
index 3e719ff..b88e432 100644
Binary files a/INSTALL/grub/arm64-efi/part_plan.mod and b/INSTALL/grub/arm64-efi/part_plan.mod differ
diff --git a/INSTALL/grub/arm64-efi/part_sun.mod b/INSTALL/grub/arm64-efi/part_sun.mod
index 6ca0dd5..6937d36 100644
Binary files a/INSTALL/grub/arm64-efi/part_sun.mod and b/INSTALL/grub/arm64-efi/part_sun.mod differ
diff --git a/INSTALL/grub/arm64-efi/part_sunpc.mod b/INSTALL/grub/arm64-efi/part_sunpc.mod
index 45ad50e..c86ec82 100644
Binary files a/INSTALL/grub/arm64-efi/part_sunpc.mod and b/INSTALL/grub/arm64-efi/part_sunpc.mod differ
diff --git a/INSTALL/grub/arm64-efi/partmap.lst b/INSTALL/grub/arm64-efi/partmap.lst
index 761233a..720c55e 100644
Binary files a/INSTALL/grub/arm64-efi/partmap.lst and b/INSTALL/grub/arm64-efi/partmap.lst differ
diff --git a/INSTALL/grub/arm64-efi/parttool.lst b/INSTALL/grub/arm64-efi/parttool.lst
index 68b4b5c..bfa2d4a 100644
Binary files a/INSTALL/grub/arm64-efi/parttool.lst and b/INSTALL/grub/arm64-efi/parttool.lst differ
diff --git a/INSTALL/grub/arm64-efi/parttool.mod b/INSTALL/grub/arm64-efi/parttool.mod
index 0ca0e5f..bbf25f4 100644
Binary files a/INSTALL/grub/arm64-efi/parttool.mod and b/INSTALL/grub/arm64-efi/parttool.mod differ
diff --git a/INSTALL/grub/arm64-efi/password.mod b/INSTALL/grub/arm64-efi/password.mod
index c9640fc..79ea75e 100644
Binary files a/INSTALL/grub/arm64-efi/password.mod and b/INSTALL/grub/arm64-efi/password.mod differ
diff --git a/INSTALL/grub/arm64-efi/pbkdf2_test.mod b/INSTALL/grub/arm64-efi/pbkdf2_test.mod
index 846ea5c..74067c9 100644
Binary files a/INSTALL/grub/arm64-efi/pbkdf2_test.mod and b/INSTALL/grub/arm64-efi/pbkdf2_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/pgp.mod b/INSTALL/grub/arm64-efi/pgp.mod
index bc60569..05a1eec 100644
Binary files a/INSTALL/grub/arm64-efi/pgp.mod and b/INSTALL/grub/arm64-efi/pgp.mod differ
diff --git a/INSTALL/grub/arm64-efi/probe.mod b/INSTALL/grub/arm64-efi/probe.mod
index 85d414d..ee3a926 100644
Binary files a/INSTALL/grub/arm64-efi/probe.mod and b/INSTALL/grub/arm64-efi/probe.mod differ
diff --git a/INSTALL/grub/arm64-efi/procfs.mod b/INSTALL/grub/arm64-efi/procfs.mod
index 0c9d57f..fb59fcc 100644
Binary files a/INSTALL/grub/arm64-efi/procfs.mod and b/INSTALL/grub/arm64-efi/procfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/progress.mod b/INSTALL/grub/arm64-efi/progress.mod
index a33cc65..86a5bae 100644
Binary files a/INSTALL/grub/arm64-efi/progress.mod and b/INSTALL/grub/arm64-efi/progress.mod differ
diff --git a/INSTALL/grub/arm64-efi/raid5rec.mod b/INSTALL/grub/arm64-efi/raid5rec.mod
index 7d879ac..efff74e 100644
Binary files a/INSTALL/grub/arm64-efi/raid5rec.mod and b/INSTALL/grub/arm64-efi/raid5rec.mod differ
diff --git a/INSTALL/grub/arm64-efi/raid6rec.mod b/INSTALL/grub/arm64-efi/raid6rec.mod
index c9bc6ba..15dc7e5 100644
Binary files a/INSTALL/grub/arm64-efi/raid6rec.mod and b/INSTALL/grub/arm64-efi/raid6rec.mod differ
diff --git a/INSTALL/grub/arm64-efi/reiserfs.mod b/INSTALL/grub/arm64-efi/reiserfs.mod
index a1d3de6..46a19bc 100644
Binary files a/INSTALL/grub/arm64-efi/reiserfs.mod and b/INSTALL/grub/arm64-efi/reiserfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/romfs.mod b/INSTALL/grub/arm64-efi/romfs.mod
index 807776f..b861540 100644
Binary files a/INSTALL/grub/arm64-efi/romfs.mod and b/INSTALL/grub/arm64-efi/romfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/scsi.mod b/INSTALL/grub/arm64-efi/scsi.mod
index bf5e14b..533d074 100644
Binary files a/INSTALL/grub/arm64-efi/scsi.mod and b/INSTALL/grub/arm64-efi/scsi.mod differ
diff --git a/INSTALL/grub/arm64-efi/search_fs_file.mod b/INSTALL/grub/arm64-efi/search_fs_file.mod
index 9467d97..abedb33 100644
Binary files a/INSTALL/grub/arm64-efi/search_fs_file.mod and b/INSTALL/grub/arm64-efi/search_fs_file.mod differ
diff --git a/INSTALL/grub/arm64-efi/search_fs_uuid.mod b/INSTALL/grub/arm64-efi/search_fs_uuid.mod
index 2fe64d6..f17b854 100644
Binary files a/INSTALL/grub/arm64-efi/search_fs_uuid.mod and b/INSTALL/grub/arm64-efi/search_fs_uuid.mod differ
diff --git a/INSTALL/grub/arm64-efi/search_label.mod b/INSTALL/grub/arm64-efi/search_label.mod
index 536e2e7..0f6cc29 100644
Binary files a/INSTALL/grub/arm64-efi/search_label.mod and b/INSTALL/grub/arm64-efi/search_label.mod differ
diff --git a/INSTALL/grub/arm64-efi/setjmp.mod b/INSTALL/grub/arm64-efi/setjmp.mod
index 8104cc7..b7e7877 100644
Binary files a/INSTALL/grub/arm64-efi/setjmp.mod and b/INSTALL/grub/arm64-efi/setjmp.mod differ
diff --git a/INSTALL/grub/arm64-efi/setjmp_test.mod b/INSTALL/grub/arm64-efi/setjmp_test.mod
index a7290ef..d003e85 100644
Binary files a/INSTALL/grub/arm64-efi/setjmp_test.mod and b/INSTALL/grub/arm64-efi/setjmp_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/sfs.mod b/INSTALL/grub/arm64-efi/sfs.mod
index 680d753..299ed04 100644
Binary files a/INSTALL/grub/arm64-efi/sfs.mod and b/INSTALL/grub/arm64-efi/sfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/shift_test.mod b/INSTALL/grub/arm64-efi/shift_test.mod
index 4d7c762..cb25250 100644
Binary files a/INSTALL/grub/arm64-efi/shift_test.mod and b/INSTALL/grub/arm64-efi/shift_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/signature_test.mod b/INSTALL/grub/arm64-efi/signature_test.mod
index 781758c..95eb0f1 100644
Binary files a/INSTALL/grub/arm64-efi/signature_test.mod and b/INSTALL/grub/arm64-efi/signature_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/sleep_test.mod b/INSTALL/grub/arm64-efi/sleep_test.mod
index 5626943..b5a9fe3 100644
Binary files a/INSTALL/grub/arm64-efi/sleep_test.mod and b/INSTALL/grub/arm64-efi/sleep_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/strtoull_test.mod b/INSTALL/grub/arm64-efi/strtoull_test.mod
index 0463d25..3b9136c 100644
Binary files a/INSTALL/grub/arm64-efi/strtoull_test.mod and b/INSTALL/grub/arm64-efi/strtoull_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/syslinuxcfg.mod b/INSTALL/grub/arm64-efi/syslinuxcfg.mod
index b2fd45a..f9331a6 100644
Binary files a/INSTALL/grub/arm64-efi/syslinuxcfg.mod and b/INSTALL/grub/arm64-efi/syslinuxcfg.mod differ
diff --git a/INSTALL/grub/arm64-efi/terminal.lst b/INSTALL/grub/arm64-efi/terminal.lst
index 6743731..b2cfb3f 100644
Binary files a/INSTALL/grub/arm64-efi/terminal.lst and b/INSTALL/grub/arm64-efi/terminal.lst differ
diff --git a/INSTALL/grub/arm64-efi/test_blockarg.mod b/INSTALL/grub/arm64-efi/test_blockarg.mod
index c5aaaff..c1c8b21 100644
Binary files a/INSTALL/grub/arm64-efi/test_blockarg.mod and b/INSTALL/grub/arm64-efi/test_blockarg.mod differ
diff --git a/INSTALL/grub/arm64-efi/testload.mod b/INSTALL/grub/arm64-efi/testload.mod
index be494eb..7aa0eaf 100644
Binary files a/INSTALL/grub/arm64-efi/testload.mod and b/INSTALL/grub/arm64-efi/testload.mod differ
diff --git a/INSTALL/grub/arm64-efi/testspeed.mod b/INSTALL/grub/arm64-efi/testspeed.mod
index 4206de5..35e6489 100644
Binary files a/INSTALL/grub/arm64-efi/testspeed.mod and b/INSTALL/grub/arm64-efi/testspeed.mod differ
diff --git a/INSTALL/grub/arm64-efi/tga.mod b/INSTALL/grub/arm64-efi/tga.mod
index b0930b8..8698d99 100644
Binary files a/INSTALL/grub/arm64-efi/tga.mod and b/INSTALL/grub/arm64-efi/tga.mod differ
diff --git a/INSTALL/grub/arm64-efi/time.mod b/INSTALL/grub/arm64-efi/time.mod
index ecf0c3d..0bcbc03 100644
Binary files a/INSTALL/grub/arm64-efi/time.mod and b/INSTALL/grub/arm64-efi/time.mod differ
diff --git a/INSTALL/grub/arm64-efi/tr.mod b/INSTALL/grub/arm64-efi/tr.mod
index e13edc9..e39da7c 100644
Binary files a/INSTALL/grub/arm64-efi/tr.mod and b/INSTALL/grub/arm64-efi/tr.mod differ
diff --git a/INSTALL/grub/arm64-efi/ufs1.mod b/INSTALL/grub/arm64-efi/ufs1.mod
index 98104e6..5448020 100644
Binary files a/INSTALL/grub/arm64-efi/ufs1.mod and b/INSTALL/grub/arm64-efi/ufs1.mod differ
diff --git a/INSTALL/grub/arm64-efi/ufs1_be.mod b/INSTALL/grub/arm64-efi/ufs1_be.mod
index 0e3c0e4..68c1788 100644
Binary files a/INSTALL/grub/arm64-efi/ufs1_be.mod and b/INSTALL/grub/arm64-efi/ufs1_be.mod differ
diff --git a/INSTALL/grub/arm64-efi/ufs2.mod b/INSTALL/grub/arm64-efi/ufs2.mod
index df0db5f..c65ea87 100644
Binary files a/INSTALL/grub/arm64-efi/ufs2.mod and b/INSTALL/grub/arm64-efi/ufs2.mod differ
diff --git a/INSTALL/grub/arm64-efi/verifiers.mod b/INSTALL/grub/arm64-efi/verifiers.mod
index a2f6231..0b389c4 100644
Binary files a/INSTALL/grub/arm64-efi/verifiers.mod and b/INSTALL/grub/arm64-efi/verifiers.mod differ
diff --git a/INSTALL/grub/arm64-efi/video.lst b/INSTALL/grub/arm64-efi/video.lst
index 9f0892c..ad1dbd0 100644
Binary files a/INSTALL/grub/arm64-efi/video.lst and b/INSTALL/grub/arm64-efi/video.lst differ
diff --git a/INSTALL/grub/arm64-efi/videoinfo.mod b/INSTALL/grub/arm64-efi/videoinfo.mod
index 7d6bcd5..f3f88b0 100644
Binary files a/INSTALL/grub/arm64-efi/videoinfo.mod and b/INSTALL/grub/arm64-efi/videoinfo.mod differ
diff --git a/INSTALL/grub/arm64-efi/videotest.mod b/INSTALL/grub/arm64-efi/videotest.mod
index a742213..f8383a0 100644
Binary files a/INSTALL/grub/arm64-efi/videotest.mod and b/INSTALL/grub/arm64-efi/videotest.mod differ
diff --git a/INSTALL/grub/arm64-efi/videotest_checksum.mod b/INSTALL/grub/arm64-efi/videotest_checksum.mod
index 9eccebb..bb4a325 100644
Binary files a/INSTALL/grub/arm64-efi/videotest_checksum.mod and b/INSTALL/grub/arm64-efi/videotest_checksum.mod differ
diff --git a/INSTALL/grub/arm64-efi/xen_boot.mod b/INSTALL/grub/arm64-efi/xen_boot.mod
index 117f648..ae21ef0 100644
Binary files a/INSTALL/grub/arm64-efi/xen_boot.mod and b/INSTALL/grub/arm64-efi/xen_boot.mod differ
diff --git a/INSTALL/grub/arm64-efi/xnu_uuid.mod b/INSTALL/grub/arm64-efi/xnu_uuid.mod
index 5ceebfe..d3f711b 100644
Binary files a/INSTALL/grub/arm64-efi/xnu_uuid.mod and b/INSTALL/grub/arm64-efi/xnu_uuid.mod differ
diff --git a/INSTALL/grub/arm64-efi/xnu_uuid_test.mod b/INSTALL/grub/arm64-efi/xnu_uuid_test.mod
index 95ed9f6..0d84ebd 100644
Binary files a/INSTALL/grub/arm64-efi/xnu_uuid_test.mod and b/INSTALL/grub/arm64-efi/xnu_uuid_test.mod differ
diff --git a/INSTALL/grub/arm64-efi/zfs.mod b/INSTALL/grub/arm64-efi/zfs.mod
index 67c4b2d..f83071a 100644
Binary files a/INSTALL/grub/arm64-efi/zfs.mod and b/INSTALL/grub/arm64-efi/zfs.mod differ
diff --git a/INSTALL/grub/arm64-efi/zfscrypt.mod b/INSTALL/grub/arm64-efi/zfscrypt.mod
index 8afa990..59c516e 100644
Binary files a/INSTALL/grub/arm64-efi/zfscrypt.mod and b/INSTALL/grub/arm64-efi/zfscrypt.mod differ
diff --git a/INSTALL/grub/arm64-efi/zfsinfo.mod b/INSTALL/grub/arm64-efi/zfsinfo.mod
index 7a7db52..afe286f 100644
Binary files a/INSTALL/grub/arm64-efi/zfsinfo.mod and b/INSTALL/grub/arm64-efi/zfsinfo.mod differ
diff --git a/INSTALL/grub/arm64-efi/zstd.mod b/INSTALL/grub/arm64-efi/zstd.mod
index 3831453..aeef157 100644
Binary files a/INSTALL/grub/arm64-efi/zstd.mod and b/INSTALL/grub/arm64-efi/zstd.mod differ
diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index cb538c9..7784b31 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -156,6 +156,12 @@ function locate_initrd {
 }
 
 function locate_wim {
+    if vt_strstr "$vt_volume_id" "yr"; then
+        if [ -f (loop)/isyl/isyl ]; then
+            vt_wim_peset
+        fi
+    fi
+
     vt_windows_locate_wim_patch (loop)
     
     if [ -n "${vtdebug_flag}" ]; then
diff --git a/INSTALL/grub/i386-efi/moddep.lst b/INSTALL/grub/i386-efi/moddep.lst
index 970ddfd..479d6bd 100644
--- a/INSTALL/grub/i386-efi/moddep.lst
+++ b/INSTALL/grub/i386-efi/moddep.lst
@@ -26,7 +26,7 @@ sfs: fshelp
 reiserfs: fshelp
 part_sunpc:
 zstd:
-gfxmenu: trig video_colors bitmap_scale gfxterm font normal bitmap video
+gfxmenu: trig video_colors gfxterm bitmap_scale font normal video bitmap
 backtrace:
 jfs:
 help: extcmd normal
diff --git a/INSTALL/grub/i386-efi/normal.mod b/INSTALL/grub/i386-efi/normal.mod
index 1562ae8..fe35b9c 100644
Binary files a/INSTALL/grub/i386-efi/normal.mod and b/INSTALL/grub/i386-efi/normal.mod differ
diff --git a/INSTALL/grub/i386-efi/part_amiga.mod b/INSTALL/grub/i386-efi/part_amiga.mod
index eb4307c..b4e502f 100644
Binary files a/INSTALL/grub/i386-efi/part_amiga.mod and b/INSTALL/grub/i386-efi/part_amiga.mod differ
diff --git a/INSTALL/grub/i386-efi/part_bsd.mod b/INSTALL/grub/i386-efi/part_bsd.mod
index 0b5baf2..e4b4571 100644
Binary files a/INSTALL/grub/i386-efi/part_bsd.mod and b/INSTALL/grub/i386-efi/part_bsd.mod differ
diff --git a/INSTALL/grub/i386-efi/part_dfly.mod b/INSTALL/grub/i386-efi/part_dfly.mod
index 6bfe671..bc4c9d9 100644
Binary files a/INSTALL/grub/i386-efi/part_dfly.mod and b/INSTALL/grub/i386-efi/part_dfly.mod differ
diff --git a/INSTALL/grub/i386-efi/part_dvh.mod b/INSTALL/grub/i386-efi/part_dvh.mod
index 7f1e438..c08b518 100644
Binary files a/INSTALL/grub/i386-efi/part_dvh.mod and b/INSTALL/grub/i386-efi/part_dvh.mod differ
diff --git a/INSTALL/grub/i386-efi/part_plan.mod b/INSTALL/grub/i386-efi/part_plan.mod
index 9567742..e0763fc 100644
Binary files a/INSTALL/grub/i386-efi/part_plan.mod and b/INSTALL/grub/i386-efi/part_plan.mod differ
diff --git a/INSTALL/grub/i386-efi/part_sun.mod b/INSTALL/grub/i386-efi/part_sun.mod
index 0dbb445..54a8d50 100644
Binary files a/INSTALL/grub/i386-efi/part_sun.mod and b/INSTALL/grub/i386-efi/part_sun.mod differ
diff --git a/INSTALL/grub/i386-efi/part_sunpc.mod b/INSTALL/grub/i386-efi/part_sunpc.mod
index ec07346..09d5c60 100644
Binary files a/INSTALL/grub/i386-efi/part_sunpc.mod and b/INSTALL/grub/i386-efi/part_sunpc.mod differ
diff --git a/INSTALL/grub/i386-pc/core.img b/INSTALL/grub/i386-pc/core.img
index f6fbc39..2dabb50 100644
Binary files a/INSTALL/grub/i386-pc/core.img and b/INSTALL/grub/i386-pc/core.img differ
diff --git a/INSTALL/grub/i386-pc/moddep.lst b/INSTALL/grub/i386-pc/moddep.lst
index ce64378..df8a186 100644
--- a/INSTALL/grub/i386-pc/moddep.lst
+++ b/INSTALL/grub/i386-pc/moddep.lst
@@ -26,7 +26,7 @@ sfs: fshelp
 reiserfs: fshelp
 part_sunpc:
 zstd:
-gfxmenu: trig video_colors bitmap_scale gfxterm font normal bitmap video
+gfxmenu: trig video_colors gfxterm bitmap_scale font normal video bitmap
 backtrace:
 jfs:
 help: extcmd normal
@@ -123,7 +123,7 @@ crypto:
 part_bsd: part_msdos
 cs5536: pci
 biosdisk:
-ventoy: elf fshelp ext2 btrfs font crypto gcry_md5 exfat udf datetime div extcmd normal video gcry_sha1 iso9660 acpi
+ventoy: elf fshelp ext2 btrfs font crypto gcry_md5 exfat udf extcmd datetime div normal video gcry_sha1 iso9660 acpi
 lsapm:
 gcry_sha512: crypto
 password: crypto normal
diff --git a/INSTALL/grub/i386-pc/part_amiga.mod b/INSTALL/grub/i386-pc/part_amiga.mod
index a841186..e56fd4a 100644
Binary files a/INSTALL/grub/i386-pc/part_amiga.mod and b/INSTALL/grub/i386-pc/part_amiga.mod differ
diff --git a/INSTALL/grub/i386-pc/part_apple.mod b/INSTALL/grub/i386-pc/part_apple.mod
index a30a0a0..62400e3 100644
Binary files a/INSTALL/grub/i386-pc/part_apple.mod and b/INSTALL/grub/i386-pc/part_apple.mod differ
diff --git a/INSTALL/grub/i386-pc/part_bsd.mod b/INSTALL/grub/i386-pc/part_bsd.mod
index 9c660b8..37151c3 100644
Binary files a/INSTALL/grub/i386-pc/part_bsd.mod and b/INSTALL/grub/i386-pc/part_bsd.mod differ
diff --git a/INSTALL/grub/i386-pc/part_dfly.mod b/INSTALL/grub/i386-pc/part_dfly.mod
index d59ec33..cead265 100644
Binary files a/INSTALL/grub/i386-pc/part_dfly.mod and b/INSTALL/grub/i386-pc/part_dfly.mod differ
diff --git a/INSTALL/grub/i386-pc/part_dvh.mod b/INSTALL/grub/i386-pc/part_dvh.mod
index 21b6fec..c812065 100644
Binary files a/INSTALL/grub/i386-pc/part_dvh.mod and b/INSTALL/grub/i386-pc/part_dvh.mod differ
diff --git a/INSTALL/grub/i386-pc/part_plan.mod b/INSTALL/grub/i386-pc/part_plan.mod
index d074510..7f448fd 100644
Binary files a/INSTALL/grub/i386-pc/part_plan.mod and b/INSTALL/grub/i386-pc/part_plan.mod differ
diff --git a/INSTALL/grub/i386-pc/part_sun.mod b/INSTALL/grub/i386-pc/part_sun.mod
index 81edb5e..7e9abf5 100644
Binary files a/INSTALL/grub/i386-pc/part_sun.mod and b/INSTALL/grub/i386-pc/part_sun.mod differ
diff --git a/INSTALL/grub/i386-pc/part_sunpc.mod b/INSTALL/grub/i386-pc/part_sunpc.mod
index 5c649b6..a9246af 100644
Binary files a/INSTALL/grub/i386-pc/part_sunpc.mod and b/INSTALL/grub/i386-pc/part_sunpc.mod differ
diff --git a/INSTALL/grub/mips64el-efi/moddep.lst b/INSTALL/grub/mips64el-efi/moddep.lst
index 916d5bd..b16abbf 100644
Binary files a/INSTALL/grub/mips64el-efi/moddep.lst and b/INSTALL/grub/mips64el-efi/moddep.lst differ
diff --git a/INSTALL/grub/mips64el-efi/normal.mod b/INSTALL/grub/mips64el-efi/normal.mod
index 8723f43..8236497 100644
Binary files a/INSTALL/grub/mips64el-efi/normal.mod and b/INSTALL/grub/mips64el-efi/normal.mod differ
diff --git a/INSTALL/grub/mips64el-efi/part_amiga.mod b/INSTALL/grub/mips64el-efi/part_amiga.mod
index af48dcf..a705f8d 100644
Binary files a/INSTALL/grub/mips64el-efi/part_amiga.mod and b/INSTALL/grub/mips64el-efi/part_amiga.mod differ
diff --git a/INSTALL/grub/mips64el-efi/part_bsd.mod b/INSTALL/grub/mips64el-efi/part_bsd.mod
index c3c8d78..e4523e7 100644
Binary files a/INSTALL/grub/mips64el-efi/part_bsd.mod and b/INSTALL/grub/mips64el-efi/part_bsd.mod differ
diff --git a/INSTALL/grub/mips64el-efi/part_dfly.mod b/INSTALL/grub/mips64el-efi/part_dfly.mod
index 25f78f2..6b6dde0 100644
Binary files a/INSTALL/grub/mips64el-efi/part_dfly.mod and b/INSTALL/grub/mips64el-efi/part_dfly.mod differ
diff --git a/INSTALL/grub/mips64el-efi/part_dvh.mod b/INSTALL/grub/mips64el-efi/part_dvh.mod
index 40974fa..a3582cc 100644
Binary files a/INSTALL/grub/mips64el-efi/part_dvh.mod and b/INSTALL/grub/mips64el-efi/part_dvh.mod differ
diff --git a/INSTALL/grub/mips64el-efi/part_plan.mod b/INSTALL/grub/mips64el-efi/part_plan.mod
index 4836bbc..e7b9cc2 100644
Binary files a/INSTALL/grub/mips64el-efi/part_plan.mod and b/INSTALL/grub/mips64el-efi/part_plan.mod differ
diff --git a/INSTALL/grub/mips64el-efi/part_sun.mod b/INSTALL/grub/mips64el-efi/part_sun.mod
index a08f049..4dcb3af 100644
Binary files a/INSTALL/grub/mips64el-efi/part_sun.mod and b/INSTALL/grub/mips64el-efi/part_sun.mod differ
diff --git a/INSTALL/grub/mips64el-efi/part_sunpc.mod b/INSTALL/grub/mips64el-efi/part_sunpc.mod
index 7477417..7aea649 100644
Binary files a/INSTALL/grub/mips64el-efi/part_sunpc.mod and b/INSTALL/grub/mips64el-efi/part_sunpc.mod differ
diff --git a/INSTALL/grub/x86_64-efi/moddep.lst b/INSTALL/grub/x86_64-efi/moddep.lst
index 2f7f9af..5705995 100644
--- a/INSTALL/grub/x86_64-efi/moddep.lst
+++ b/INSTALL/grub/x86_64-efi/moddep.lst
@@ -26,7 +26,7 @@ sfs: fshelp
 reiserfs: fshelp
 part_sunpc:
 zstd:
-gfxmenu: trig video_colors bitmap_scale gfxterm font normal bitmap video
+gfxmenu: trig video_colors gfxterm bitmap_scale font normal video bitmap
 backtrace:
 jfs:
 help: extcmd normal
diff --git a/INSTALL/grub/x86_64-efi/normal.mod b/INSTALL/grub/x86_64-efi/normal.mod
index 7606545..9283902 100644
Binary files a/INSTALL/grub/x86_64-efi/normal.mod and b/INSTALL/grub/x86_64-efi/normal.mod differ
diff --git a/INSTALL/grub/x86_64-efi/part_amiga.mod b/INSTALL/grub/x86_64-efi/part_amiga.mod
index b16590f..5bf5667 100644
Binary files a/INSTALL/grub/x86_64-efi/part_amiga.mod and b/INSTALL/grub/x86_64-efi/part_amiga.mod differ
diff --git a/INSTALL/grub/x86_64-efi/part_bsd.mod b/INSTALL/grub/x86_64-efi/part_bsd.mod
index d4bf05e..9123c90 100644
Binary files a/INSTALL/grub/x86_64-efi/part_bsd.mod and b/INSTALL/grub/x86_64-efi/part_bsd.mod differ
diff --git a/INSTALL/grub/x86_64-efi/part_dfly.mod b/INSTALL/grub/x86_64-efi/part_dfly.mod
index d7b1d8e..cf7c46e 100644
Binary files a/INSTALL/grub/x86_64-efi/part_dfly.mod and b/INSTALL/grub/x86_64-efi/part_dfly.mod differ
diff --git a/INSTALL/grub/x86_64-efi/part_dvh.mod b/INSTALL/grub/x86_64-efi/part_dvh.mod
index 509c3a6..37acae5 100644
Binary files a/INSTALL/grub/x86_64-efi/part_dvh.mod and b/INSTALL/grub/x86_64-efi/part_dvh.mod differ
diff --git a/INSTALL/grub/x86_64-efi/part_plan.mod b/INSTALL/grub/x86_64-efi/part_plan.mod
index 826f54d..8825a81 100644
Binary files a/INSTALL/grub/x86_64-efi/part_plan.mod and b/INSTALL/grub/x86_64-efi/part_plan.mod differ
diff --git a/INSTALL/grub/x86_64-efi/part_sun.mod b/INSTALL/grub/x86_64-efi/part_sun.mod
index d054e87..3fd865f 100644
Binary files a/INSTALL/grub/x86_64-efi/part_sun.mod and b/INSTALL/grub/x86_64-efi/part_sun.mod differ
diff --git a/INSTALL/grub/x86_64-efi/part_sunpc.mod b/INSTALL/grub/x86_64-efi/part_sunpc.mod
index b17db00..576a0fe 100644
Binary files a/INSTALL/grub/x86_64-efi/part_sunpc.mod and b/INSTALL/grub/x86_64-efi/part_sunpc.mod differ