diff --git a/config/rootfiles/common/aarch64/grub b/config/rootfiles/common/aarch64/grub
index 274346765..2d2370771 100644
--- a/config/rootfiles/common/aarch64/grub
+++ b/config/rootfiles/common/aarch64/grub
@@ -1,7 +1,5 @@
 #boot/grub
 boot/grub/splash.png
-#etc/bash_completion.d
-#etc/bash_completion.d/grub
 #etc/default
 etc/default/grub
 #etc/grub.d
@@ -29,6 +27,7 @@ usr/bin/grub-mkpasswd-pbkdf2
 usr/bin/grub-mkrelpath
 usr/bin/grub-mkrescue
 usr/bin/grub-mkstandalone
+usr/bin/grub-protect
 usr/bin/grub-render-label
 usr/bin/grub-script-check
 usr/bin/grub-syslinux2cfg
@@ -48,6 +47,10 @@ usr/lib/grub/arm64-efi/all_video.mod
 usr/lib/grub/arm64-efi/all_video.module
 usr/lib/grub/arm64-efi/archelp.mod
 usr/lib/grub/arm64-efi/archelp.module
+usr/lib/grub/arm64-efi/asn1.mod
+usr/lib/grub/arm64-efi/asn1.module
+usr/lib/grub/arm64-efi/asn1_test.mod
+usr/lib/grub/arm64-efi/asn1_test.module
 usr/lib/grub/arm64-efi/bfs.mod
 usr/lib/grub/arm64-efi/bfs.module
 usr/lib/grub/arm64-efi/bitmap.mod
@@ -72,8 +75,6 @@ usr/lib/grub/arm64-efi/cbfs.mod
 usr/lib/grub/arm64-efi/cbfs.module
 usr/lib/grub/arm64-efi/chain.mod
 usr/lib/grub/arm64-efi/chain.module
-usr/lib/grub/arm64-efi/cmdline_cat_test.mod
-usr/lib/grub/arm64-efi/cmdline_cat_test.module
 usr/lib/grub/arm64-efi/cmp.mod
 usr/lib/grub/arm64-efi/cmp.module
 usr/lib/grub/arm64-efi/cmp_test.mod
@@ -111,6 +112,8 @@ usr/lib/grub/arm64-efi/div_test.mod
 usr/lib/grub/arm64-efi/div_test.module
 usr/lib/grub/arm64-efi/dm_nv.mod
 usr/lib/grub/arm64-efi/dm_nv.module
+usr/lib/grub/arm64-efi/dsa_sexp_test.mod
+usr/lib/grub/arm64-efi/dsa_sexp_test.module
 usr/lib/grub/arm64-efi/echo.mod
 usr/lib/grub/arm64-efi/echo.module
 usr/lib/grub/arm64-efi/efi_gop.mod
@@ -123,6 +126,8 @@ usr/lib/grub/arm64-efi/efitextmode.mod
 usr/lib/grub/arm64-efi/efitextmode.module
 usr/lib/grub/arm64-efi/elf.mod
 usr/lib/grub/arm64-efi/elf.module
+usr/lib/grub/arm64-efi/erofs.mod
+usr/lib/grub/arm64-efi/erofs.module
 usr/lib/grub/arm64-efi/eval.mod
 usr/lib/grub/arm64-efi/eval.module
 usr/lib/grub/arm64-efi/exfat.mod
@@ -151,6 +156,10 @@ usr/lib/grub/arm64-efi/functional_test.mod
 usr/lib/grub/arm64-efi/functional_test.module
 usr/lib/grub/arm64-efi/gcry_arcfour.mod
 usr/lib/grub/arm64-efi/gcry_arcfour.module
+usr/lib/grub/arm64-efi/gcry_aria.mod
+usr/lib/grub/arm64-efi/gcry_aria.module
+usr/lib/grub/arm64-efi/gcry_blake2.mod
+usr/lib/grub/arm64-efi/gcry_blake2.module
 usr/lib/grub/arm64-efi/gcry_blowfish.mod
 usr/lib/grub/arm64-efi/gcry_blowfish.module
 usr/lib/grub/arm64-efi/gcry_camellia.mod
@@ -163,8 +172,14 @@ usr/lib/grub/arm64-efi/gcry_des.mod
 usr/lib/grub/arm64-efi/gcry_des.module
 usr/lib/grub/arm64-efi/gcry_dsa.mod
 usr/lib/grub/arm64-efi/gcry_dsa.module
+usr/lib/grub/arm64-efi/gcry_gost28147.mod
+usr/lib/grub/arm64-efi/gcry_gost28147.module
+usr/lib/grub/arm64-efi/gcry_gostr3411_94.mod
+usr/lib/grub/arm64-efi/gcry_gostr3411_94.module
 usr/lib/grub/arm64-efi/gcry_idea.mod
 usr/lib/grub/arm64-efi/gcry_idea.module
+usr/lib/grub/arm64-efi/gcry_keccak.mod
+usr/lib/grub/arm64-efi/gcry_keccak.module
 usr/lib/grub/arm64-efi/gcry_md4.mod
 usr/lib/grub/arm64-efi/gcry_md4.module
 usr/lib/grub/arm64-efi/gcry_md5.mod
@@ -177,6 +192,8 @@ usr/lib/grub/arm64-efi/gcry_rmd160.mod
 usr/lib/grub/arm64-efi/gcry_rmd160.module
 usr/lib/grub/arm64-efi/gcry_rsa.mod
 usr/lib/grub/arm64-efi/gcry_rsa.module
+usr/lib/grub/arm64-efi/gcry_salsa20.mod
+usr/lib/grub/arm64-efi/gcry_salsa20.module
 usr/lib/grub/arm64-efi/gcry_seed.mod
 usr/lib/grub/arm64-efi/gcry_seed.module
 usr/lib/grub/arm64-efi/gcry_serpent.mod
@@ -187,6 +204,12 @@ usr/lib/grub/arm64-efi/gcry_sha256.mod
 usr/lib/grub/arm64-efi/gcry_sha256.module
 usr/lib/grub/arm64-efi/gcry_sha512.mod
 usr/lib/grub/arm64-efi/gcry_sha512.module
+usr/lib/grub/arm64-efi/gcry_sm3.mod
+usr/lib/grub/arm64-efi/gcry_sm3.module
+usr/lib/grub/arm64-efi/gcry_sm4.mod
+usr/lib/grub/arm64-efi/gcry_sm4.module
+usr/lib/grub/arm64-efi/gcry_stribog.mod
+usr/lib/grub/arm64-efi/gcry_stribog.module
 usr/lib/grub/arm64-efi/gcry_tiger.mod
 usr/lib/grub/arm64-efi/gcry_tiger.module
 usr/lib/grub/arm64-efi/gcry_twofish.mod
@@ -205,8 +228,6 @@ usr/lib/grub/arm64-efi/gfxterm.mod
 usr/lib/grub/arm64-efi/gfxterm.module
 usr/lib/grub/arm64-efi/gfxterm_background.mod
 usr/lib/grub/arm64-efi/gfxterm_background.module
-usr/lib/grub/arm64-efi/gfxterm_menu.mod
-usr/lib/grub/arm64-efi/gfxterm_menu.module
 usr/lib/grub/arm64-efi/gptsync.mod
 usr/lib/grub/arm64-efi/gptsync.module
 usr/lib/grub/arm64-efi/gzio.mod
@@ -239,6 +260,8 @@ usr/lib/grub/arm64-efi/json.mod
 usr/lib/grub/arm64-efi/json.module
 usr/lib/grub/arm64-efi/kernel.exec
 usr/lib/grub/arm64-efi/kernel.img
+usr/lib/grub/arm64-efi/key_protector.mod
+usr/lib/grub/arm64-efi/key_protector.module
 usr/lib/grub/arm64-efi/keystatus.mod
 usr/lib/grub/arm64-efi/keystatus.module
 usr/lib/grub/arm64-efi/ldm.mod
@@ -373,6 +396,8 @@ usr/lib/grub/arm64-efi/procfs.mod
 usr/lib/grub/arm64-efi/procfs.module
 usr/lib/grub/arm64-efi/progress.mod
 usr/lib/grub/arm64-efi/progress.module
+usr/lib/grub/arm64-efi/pubkey.mod
+usr/lib/grub/arm64-efi/pubkey.module
 usr/lib/grub/arm64-efi/raid5rec.mod
 usr/lib/grub/arm64-efi/raid5rec.module
 usr/lib/grub/arm64-efi/raid6rec.mod
@@ -387,6 +412,8 @@ usr/lib/grub/arm64-efi/reiserfs.mod
 usr/lib/grub/arm64-efi/reiserfs.module
 usr/lib/grub/arm64-efi/romfs.mod
 usr/lib/grub/arm64-efi/romfs.module
+usr/lib/grub/arm64-efi/rsa_sexp_test.mod
+usr/lib/grub/arm64-efi/rsa_sexp_test.module
 usr/lib/grub/arm64-efi/scsi.mod
 usr/lib/grub/arm64-efi/scsi.module
 usr/lib/grub/arm64-efi/search.mod
@@ -444,12 +471,16 @@ usr/lib/grub/arm64-efi/time.mod
 usr/lib/grub/arm64-efi/time.module
 usr/lib/grub/arm64-efi/tpm.mod
 usr/lib/grub/arm64-efi/tpm.module
+usr/lib/grub/arm64-efi/tpm2_key_protector.mod
+usr/lib/grub/arm64-efi/tpm2_key_protector.module
 usr/lib/grub/arm64-efi/tr.mod
 usr/lib/grub/arm64-efi/tr.module
 usr/lib/grub/arm64-efi/trig.mod
 usr/lib/grub/arm64-efi/trig.module
 usr/lib/grub/arm64-efi/true.mod
 usr/lib/grub/arm64-efi/true.module
+usr/lib/grub/arm64-efi/tss2.mod
+usr/lib/grub/arm64-efi/tss2.module
 usr/lib/grub/arm64-efi/udf.mod
 usr/lib/grub/arm64-efi/udf.module
 usr/lib/grub/arm64-efi/ufs1.mod
@@ -498,6 +529,19 @@ usr/sbin/grub-probe
 usr/sbin/grub-reboot
 usr/sbin/grub-set-default
 usr/sbin/grub-sparc64-setup
+usr/share/bash-completion/completions/grub
+usr/share/bash-completion/completions/grub-bios-setup
+usr/share/bash-completion/completions/grub-editenv
+usr/share/bash-completion/completions/grub-install
+usr/share/bash-completion/completions/grub-mkconfig
+usr/share/bash-completion/completions/grub-mkfont
+usr/share/bash-completion/completions/grub-mkimage
+usr/share/bash-completion/completions/grub-mkpasswd-pbkdf2
+usr/share/bash-completion/completions/grub-probe
+usr/share/bash-completion/completions/grub-reboot
+usr/share/bash-completion/completions/grub-script-check
+usr/share/bash-completion/completions/grub-set-default
+usr/share/bash-completion/completions/grub-sparc64-setup
 #usr/share/grub
 #usr/share/grub/ascii.h
 usr/share/grub/ascii.pf2
@@ -509,63 +553,6 @@ usr/share/grub/unicode.pf2
 #usr/share/info/grub.info
 #usr/share/info/grub.info-1
 #usr/share/info/grub.info-2
-#usr/share/locale/ast/LC_MESSAGES/grub.mo
-#usr/share/locale/ca/LC_MESSAGES/grub.mo
-#usr/share/locale/da/LC_MESSAGES/grub.mo
-#usr/share/locale/de/LC_MESSAGES/grub.mo
-#usr/share/locale/de@hebrew
-#usr/share/locale/de@hebrew/LC_MESSAGES
-#usr/share/locale/de@hebrew/LC_MESSAGES/grub.mo
-#usr/share/locale/de_CH
-#usr/share/locale/de_CH/LC_MESSAGES
-#usr/share/locale/de_CH/LC_MESSAGES/grub.mo
-#usr/share/locale/en@arabic
-#usr/share/locale/en@arabic/LC_MESSAGES
-#usr/share/locale/en@arabic/LC_MESSAGES/grub.mo
-#usr/share/locale/en@cyrillic
-#usr/share/locale/en@cyrillic/LC_MESSAGES
-#usr/share/locale/en@cyrillic/LC_MESSAGES/grub.mo
-#usr/share/locale/en@greek
-#usr/share/locale/en@greek/LC_MESSAGES
-#usr/share/locale/en@greek/LC_MESSAGES/grub.mo
-#usr/share/locale/en@hebrew
-#usr/share/locale/en@hebrew/LC_MESSAGES
-#usr/share/locale/en@hebrew/LC_MESSAGES/grub.mo
-#usr/share/locale/en@piglatin
-#usr/share/locale/en@piglatin/LC_MESSAGES
-#usr/share/locale/en@piglatin/LC_MESSAGES/grub.mo
-#usr/share/locale/en@quot/LC_MESSAGES/grub.mo
-#usr/share/locale/eo/LC_MESSAGES/grub.mo
-#usr/share/locale/es/LC_MESSAGES/grub.mo
-#usr/share/locale/fi/LC_MESSAGES/grub.mo
-#usr/share/locale/fr/LC_MESSAGES/grub.mo
-#usr/share/locale/gl/LC_MESSAGES/grub.mo
-#usr/share/locale/he/LC_MESSAGES/grub.mo
-#usr/share/locale/hr/LC_MESSAGES/grub.mo
-#usr/share/locale/hu/LC_MESSAGES/grub.mo
-#usr/share/locale/id/LC_MESSAGES/grub.mo
-#usr/share/locale/it/LC_MESSAGES/grub.mo
-#usr/share/locale/ja/LC_MESSAGES/grub.mo
-#usr/share/locale/ka/LC_MESSAGES/grub.mo
-#usr/share/locale/ko/LC_MESSAGES/grub.mo
-#usr/share/locale/lg/LC_MESSAGES/grub.mo
-#usr/share/locale/lt/LC_MESSAGES/grub.mo
-#usr/share/locale/nb/LC_MESSAGES/grub.mo
-#usr/share/locale/nl/LC_MESSAGES/grub.mo
-#usr/share/locale/pa/LC_MESSAGES/grub.mo
-#usr/share/locale/pl/LC_MESSAGES/grub.mo
-#usr/share/locale/pt/LC_MESSAGES/grub.mo
-#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo
-#usr/share/locale/ro/LC_MESSAGES/grub.mo
-#usr/share/locale/ru/LC_MESSAGES/grub.mo
-#usr/share/locale/sl/LC_MESSAGES/grub.mo
-#usr/share/locale/sr/LC_MESSAGES/grub.mo
-#usr/share/locale/sv/LC_MESSAGES/grub.mo
-#usr/share/locale/tr/LC_MESSAGES/grub.mo
-#usr/share/locale/uk/LC_MESSAGES/grub.mo
-#usr/share/locale/vi/LC_MESSAGES/grub.mo
-#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo
-#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo
 #usr/share/man/man1/grub-editenv.1
 #usr/share/man/man1/grub-file.1
 #usr/share/man/man1/grub-fstest.1
@@ -580,6 +567,7 @@ usr/share/grub/unicode.pf2
 #usr/share/man/man1/grub-mkrelpath.1
 #usr/share/man/man1/grub-mkrescue.1
 #usr/share/man/man1/grub-mkstandalone.1
+#usr/share/man/man1/grub-protect.1
 #usr/share/man/man1/grub-render-label.1
 #usr/share/man/man1/grub-script-check.1
 #usr/share/man/man1/grub-syslinux2cfg.1
diff --git a/config/rootfiles/common/riscv64/grub b/config/rootfiles/common/riscv64/grub
index 4bbe3ed70..29e1d48f4 100644
--- a/config/rootfiles/common/riscv64/grub
+++ b/config/rootfiles/common/riscv64/grub
@@ -1,7 +1,5 @@
 #boot/grub
 boot/grub/splash.png
-#etc/bash_completion.d
-#etc/bash_completion.d/grub
 #etc/default
 etc/default/grub
 #etc/grub.d
@@ -29,6 +27,7 @@ usr/bin/grub-mkpasswd-pbkdf2
 usr/bin/grub-mkrelpath
 usr/bin/grub-mkrescue
 usr/bin/grub-mkstandalone
+usr/bin/grub-protect
 usr/bin/grub-render-label
 usr/bin/grub-script-check
 usr/bin/grub-syslinux2cfg
@@ -48,6 +47,10 @@ usr/lib/grub/riscv64-efi/all_video.mod
 usr/lib/grub/riscv64-efi/all_video.module
 usr/lib/grub/riscv64-efi/archelp.mod
 usr/lib/grub/riscv64-efi/archelp.module
+usr/lib/grub/riscv64-efi/asn1.mod
+usr/lib/grub/riscv64-efi/asn1.module
+usr/lib/grub/riscv64-efi/asn1_test.mod
+usr/lib/grub/riscv64-efi/asn1_test.module
 usr/lib/grub/riscv64-efi/bfs.mod
 usr/lib/grub/riscv64-efi/bfs.module
 usr/lib/grub/riscv64-efi/bitmap.mod
@@ -72,8 +75,6 @@ usr/lib/grub/riscv64-efi/cbfs.mod
 usr/lib/grub/riscv64-efi/cbfs.module
 usr/lib/grub/riscv64-efi/chain.mod
 usr/lib/grub/riscv64-efi/chain.module
-usr/lib/grub/riscv64-efi/cmdline_cat_test.mod
-usr/lib/grub/riscv64-efi/cmdline_cat_test.module
 usr/lib/grub/riscv64-efi/cmp.mod
 usr/lib/grub/riscv64-efi/cmp.module
 usr/lib/grub/riscv64-efi/cmp_test.mod
@@ -111,6 +112,8 @@ usr/lib/grub/riscv64-efi/div_test.mod
 usr/lib/grub/riscv64-efi/div_test.module
 usr/lib/grub/riscv64-efi/dm_nv.mod
 usr/lib/grub/riscv64-efi/dm_nv.module
+usr/lib/grub/riscv64-efi/dsa_sexp_test.mod
+usr/lib/grub/riscv64-efi/dsa_sexp_test.module
 usr/lib/grub/riscv64-efi/echo.mod
 usr/lib/grub/riscv64-efi/echo.module
 usr/lib/grub/riscv64-efi/efi_gop.mod
@@ -123,6 +126,8 @@ usr/lib/grub/riscv64-efi/efitextmode.mod
 usr/lib/grub/riscv64-efi/efitextmode.module
 usr/lib/grub/riscv64-efi/elf.mod
 usr/lib/grub/riscv64-efi/elf.module
+usr/lib/grub/riscv64-efi/erofs.mod
+usr/lib/grub/riscv64-efi/erofs.module
 usr/lib/grub/riscv64-efi/eval.mod
 usr/lib/grub/riscv64-efi/eval.module
 usr/lib/grub/riscv64-efi/exfat.mod
@@ -151,6 +156,10 @@ usr/lib/grub/riscv64-efi/functional_test.mod
 usr/lib/grub/riscv64-efi/functional_test.module
 usr/lib/grub/riscv64-efi/gcry_arcfour.mod
 usr/lib/grub/riscv64-efi/gcry_arcfour.module
+usr/lib/grub/riscv64-efi/gcry_aria.mod
+usr/lib/grub/riscv64-efi/gcry_aria.module
+usr/lib/grub/riscv64-efi/gcry_blake2.mod
+usr/lib/grub/riscv64-efi/gcry_blake2.module
 usr/lib/grub/riscv64-efi/gcry_blowfish.mod
 usr/lib/grub/riscv64-efi/gcry_blowfish.module
 usr/lib/grub/riscv64-efi/gcry_camellia.mod
@@ -163,8 +172,14 @@ usr/lib/grub/riscv64-efi/gcry_des.mod
 usr/lib/grub/riscv64-efi/gcry_des.module
 usr/lib/grub/riscv64-efi/gcry_dsa.mod
 usr/lib/grub/riscv64-efi/gcry_dsa.module
+usr/lib/grub/riscv64-efi/gcry_gost28147.mod
+usr/lib/grub/riscv64-efi/gcry_gost28147.module
+usr/lib/grub/riscv64-efi/gcry_gostr3411_94.mod
+usr/lib/grub/riscv64-efi/gcry_gostr3411_94.module
 usr/lib/grub/riscv64-efi/gcry_idea.mod
 usr/lib/grub/riscv64-efi/gcry_idea.module
+usr/lib/grub/riscv64-efi/gcry_keccak.mod
+usr/lib/grub/riscv64-efi/gcry_keccak.module
 usr/lib/grub/riscv64-efi/gcry_md4.mod
 usr/lib/grub/riscv64-efi/gcry_md4.module
 usr/lib/grub/riscv64-efi/gcry_md5.mod
@@ -177,6 +192,8 @@ usr/lib/grub/riscv64-efi/gcry_rmd160.mod
 usr/lib/grub/riscv64-efi/gcry_rmd160.module
 usr/lib/grub/riscv64-efi/gcry_rsa.mod
 usr/lib/grub/riscv64-efi/gcry_rsa.module
+usr/lib/grub/riscv64-efi/gcry_salsa20.mod
+usr/lib/grub/riscv64-efi/gcry_salsa20.module
 usr/lib/grub/riscv64-efi/gcry_seed.mod
 usr/lib/grub/riscv64-efi/gcry_seed.module
 usr/lib/grub/riscv64-efi/gcry_serpent.mod
@@ -187,6 +204,12 @@ usr/lib/grub/riscv64-efi/gcry_sha256.mod
 usr/lib/grub/riscv64-efi/gcry_sha256.module
 usr/lib/grub/riscv64-efi/gcry_sha512.mod
 usr/lib/grub/riscv64-efi/gcry_sha512.module
+usr/lib/grub/riscv64-efi/gcry_sm3.mod
+usr/lib/grub/riscv64-efi/gcry_sm3.module
+usr/lib/grub/riscv64-efi/gcry_sm4.mod
+usr/lib/grub/riscv64-efi/gcry_sm4.module
+usr/lib/grub/riscv64-efi/gcry_stribog.mod
+usr/lib/grub/riscv64-efi/gcry_stribog.module
 usr/lib/grub/riscv64-efi/gcry_tiger.mod
 usr/lib/grub/riscv64-efi/gcry_tiger.module
 usr/lib/grub/riscv64-efi/gcry_twofish.mod
@@ -205,8 +228,6 @@ usr/lib/grub/riscv64-efi/gfxterm.mod
 usr/lib/grub/riscv64-efi/gfxterm.module
 usr/lib/grub/riscv64-efi/gfxterm_background.mod
 usr/lib/grub/riscv64-efi/gfxterm_background.module
-usr/lib/grub/riscv64-efi/gfxterm_menu.mod
-usr/lib/grub/riscv64-efi/gfxterm_menu.module
 usr/lib/grub/riscv64-efi/gptsync.mod
 usr/lib/grub/riscv64-efi/gptsync.module
 usr/lib/grub/riscv64-efi/gzio.mod
@@ -239,6 +260,8 @@ usr/lib/grub/riscv64-efi/json.mod
 usr/lib/grub/riscv64-efi/json.module
 usr/lib/grub/riscv64-efi/kernel.exec
 usr/lib/grub/riscv64-efi/kernel.img
+usr/lib/grub/riscv64-efi/key_protector.mod
+usr/lib/grub/riscv64-efi/key_protector.module
 usr/lib/grub/riscv64-efi/keystatus.mod
 usr/lib/grub/riscv64-efi/keystatus.module
 usr/lib/grub/riscv64-efi/ldm.mod
@@ -373,6 +396,8 @@ usr/lib/grub/riscv64-efi/procfs.mod
 usr/lib/grub/riscv64-efi/procfs.module
 usr/lib/grub/riscv64-efi/progress.mod
 usr/lib/grub/riscv64-efi/progress.module
+usr/lib/grub/riscv64-efi/pubkey.mod
+usr/lib/grub/riscv64-efi/pubkey.module
 usr/lib/grub/riscv64-efi/raid5rec.mod
 usr/lib/grub/riscv64-efi/raid5rec.module
 usr/lib/grub/riscv64-efi/raid6rec.mod
@@ -387,6 +412,8 @@ usr/lib/grub/riscv64-efi/reiserfs.mod
 usr/lib/grub/riscv64-efi/reiserfs.module
 usr/lib/grub/riscv64-efi/romfs.mod
 usr/lib/grub/riscv64-efi/romfs.module
+usr/lib/grub/riscv64-efi/rsa_sexp_test.mod
+usr/lib/grub/riscv64-efi/rsa_sexp_test.module
 usr/lib/grub/riscv64-efi/scsi.mod
 usr/lib/grub/riscv64-efi/scsi.module
 usr/lib/grub/riscv64-efi/search.mod
@@ -444,12 +471,16 @@ usr/lib/grub/riscv64-efi/time.mod
 usr/lib/grub/riscv64-efi/time.module
 usr/lib/grub/riscv64-efi/tpm.mod
 usr/lib/grub/riscv64-efi/tpm.module
+usr/lib/grub/riscv64-efi/tpm2_key_protector.mod
+usr/lib/grub/riscv64-efi/tpm2_key_protector.module
 usr/lib/grub/riscv64-efi/tr.mod
 usr/lib/grub/riscv64-efi/tr.module
 usr/lib/grub/riscv64-efi/trig.mod
 usr/lib/grub/riscv64-efi/trig.module
 usr/lib/grub/riscv64-efi/true.mod
 usr/lib/grub/riscv64-efi/true.module
+usr/lib/grub/riscv64-efi/tss2.mod
+usr/lib/grub/riscv64-efi/tss2.module
 usr/lib/grub/riscv64-efi/udf.mod
 usr/lib/grub/riscv64-efi/udf.module
 usr/lib/grub/riscv64-efi/ufs1.mod
@@ -496,6 +527,19 @@ usr/sbin/grub-probe
 usr/sbin/grub-reboot
 usr/sbin/grub-set-default
 usr/sbin/grub-sparc64-setup
+usr/share/bash-completion/completions/grub
+usr/share/bash-completion/completions/grub-bios-setup
+usr/share/bash-completion/completions/grub-editenv
+usr/share/bash-completion/completions/grub-install
+usr/share/bash-completion/completions/grub-mkconfig
+usr/share/bash-completion/completions/grub-mkfont
+usr/share/bash-completion/completions/grub-mkimage
+usr/share/bash-completion/completions/grub-mkpasswd-pbkdf2
+usr/share/bash-completion/completions/grub-probe
+usr/share/bash-completion/completions/grub-reboot
+usr/share/bash-completion/completions/grub-script-check
+usr/share/bash-completion/completions/grub-set-default
+usr/share/bash-completion/completions/grub-sparc64-setup
 #usr/share/grub
 #usr/share/grub/ascii.h
 usr/share/grub/ascii.pf2
@@ -507,63 +551,6 @@ usr/share/grub/unicode.pf2
 #usr/share/info/grub.info
 #usr/share/info/grub.info-1
 #usr/share/info/grub.info-2
-#usr/share/locale/ast/LC_MESSAGES/grub.mo
-#usr/share/locale/ca/LC_MESSAGES/grub.mo
-#usr/share/locale/da/LC_MESSAGES/grub.mo
-#usr/share/locale/de/LC_MESSAGES/grub.mo
-#usr/share/locale/de@hebrew
-#usr/share/locale/de@hebrew/LC_MESSAGES
-#usr/share/locale/de@hebrew/LC_MESSAGES/grub.mo
-#usr/share/locale/de_CH
-#usr/share/locale/de_CH/LC_MESSAGES
-#usr/share/locale/de_CH/LC_MESSAGES/grub.mo
-#usr/share/locale/en@arabic
-#usr/share/locale/en@arabic/LC_MESSAGES
-#usr/share/locale/en@arabic/LC_MESSAGES/grub.mo
-#usr/share/locale/en@cyrillic
-#usr/share/locale/en@cyrillic/LC_MESSAGES
-#usr/share/locale/en@cyrillic/LC_MESSAGES/grub.mo
-#usr/share/locale/en@greek
-#usr/share/locale/en@greek/LC_MESSAGES
-#usr/share/locale/en@greek/LC_MESSAGES/grub.mo
-#usr/share/locale/en@hebrew
-#usr/share/locale/en@hebrew/LC_MESSAGES
-#usr/share/locale/en@hebrew/LC_MESSAGES/grub.mo
-#usr/share/locale/en@piglatin
-#usr/share/locale/en@piglatin/LC_MESSAGES
-#usr/share/locale/en@piglatin/LC_MESSAGES/grub.mo
-#usr/share/locale/en@quot/LC_MESSAGES/grub.mo
-#usr/share/locale/eo/LC_MESSAGES/grub.mo
-#usr/share/locale/es/LC_MESSAGES/grub.mo
-#usr/share/locale/fi/LC_MESSAGES/grub.mo
-#usr/share/locale/fr/LC_MESSAGES/grub.mo
-#usr/share/locale/gl/LC_MESSAGES/grub.mo
-#usr/share/locale/he/LC_MESSAGES/grub.mo
-#usr/share/locale/hr/LC_MESSAGES/grub.mo
-#usr/share/locale/hu/LC_MESSAGES/grub.mo
-#usr/share/locale/id/LC_MESSAGES/grub.mo
-#usr/share/locale/it/LC_MESSAGES/grub.mo
-#usr/share/locale/ja/LC_MESSAGES/grub.mo
-#usr/share/locale/ka/LC_MESSAGES/grub.mo
-#usr/share/locale/ko/LC_MESSAGES/grub.mo
-#usr/share/locale/lg/LC_MESSAGES/grub.mo
-#usr/share/locale/lt/LC_MESSAGES/grub.mo
-#usr/share/locale/nb/LC_MESSAGES/grub.mo
-#usr/share/locale/nl/LC_MESSAGES/grub.mo
-#usr/share/locale/pa/LC_MESSAGES/grub.mo
-#usr/share/locale/pl/LC_MESSAGES/grub.mo
-#usr/share/locale/pt/LC_MESSAGES/grub.mo
-#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo
-#usr/share/locale/ro/LC_MESSAGES/grub.mo
-#usr/share/locale/ru/LC_MESSAGES/grub.mo
-#usr/share/locale/sl/LC_MESSAGES/grub.mo
-#usr/share/locale/sr/LC_MESSAGES/grub.mo
-#usr/share/locale/sv/LC_MESSAGES/grub.mo
-#usr/share/locale/tr/LC_MESSAGES/grub.mo
-#usr/share/locale/uk/LC_MESSAGES/grub.mo
-#usr/share/locale/vi/LC_MESSAGES/grub.mo
-#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo
-#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo
 #usr/share/man/man1/grub-editenv.1
 #usr/share/man/man1/grub-file.1
 #usr/share/man/man1/grub-fstest.1
@@ -578,6 +565,7 @@ usr/share/grub/unicode.pf2
 #usr/share/man/man1/grub-mkrelpath.1
 #usr/share/man/man1/grub-mkrescue.1
 #usr/share/man/man1/grub-mkstandalone.1
+#usr/share/man/man1/grub-protect.1
 #usr/share/man/man1/grub-render-label.1
 #usr/share/man/man1/grub-script-check.1
 #usr/share/man/man1/grub-syslinux2cfg.1
diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub
index 548c40a1f..90dc90800 100644
--- a/config/rootfiles/common/x86_64/grub
+++ b/config/rootfiles/common/x86_64/grub
@@ -1,8 +1,6 @@
 #boot/grub
 boot/grub/grub.cfg
 boot/grub/splash.png
-#etc/bash_completion.d
-#etc/bash_completion.d/grub
 #etc/default
 etc/default/grub
 #etc/grub.d
@@ -30,6 +28,7 @@ usr/bin/grub-mkpasswd-pbkdf2
 usr/bin/grub-mkrelpath
 usr/bin/grub-mkrescue
 usr/bin/grub-mkstandalone
+usr/bin/grub-protect
 usr/bin/grub-render-label
 usr/bin/grub-script-check
 usr/bin/grub-syslinux2cfg
@@ -53,6 +52,10 @@ usr/lib/grub/i386-pc/aout.mod
 usr/lib/grub/i386-pc/aout.module
 usr/lib/grub/i386-pc/archelp.mod
 usr/lib/grub/i386-pc/archelp.module
+usr/lib/grub/i386-pc/asn1.mod
+usr/lib/grub/i386-pc/asn1.module
+usr/lib/grub/i386-pc/asn1_test.mod
+usr/lib/grub/i386-pc/asn1_test.module
 usr/lib/grub/i386-pc/at_keyboard.mod
 usr/lib/grub/i386-pc/at_keyboard.module
 usr/lib/grub/i386-pc/ata.mod
@@ -99,8 +102,6 @@ usr/lib/grub/i386-pc/cdboot.image
 usr/lib/grub/i386-pc/cdboot.img
 usr/lib/grub/i386-pc/chain.mod
 usr/lib/grub/i386-pc/chain.module
-usr/lib/grub/i386-pc/cmdline_cat_test.mod
-usr/lib/grub/i386-pc/cmdline_cat_test.module
 usr/lib/grub/i386-pc/cmosdump.mod
 usr/lib/grub/i386-pc/cmosdump.module
 usr/lib/grub/i386-pc/cmostest.mod
@@ -150,6 +151,8 @@ usr/lib/grub/i386-pc/dm_nv.mod
 usr/lib/grub/i386-pc/dm_nv.module
 usr/lib/grub/i386-pc/drivemap.mod
 usr/lib/grub/i386-pc/drivemap.module
+usr/lib/grub/i386-pc/dsa_sexp_test.mod
+usr/lib/grub/i386-pc/dsa_sexp_test.module
 usr/lib/grub/i386-pc/echo.mod
 usr/lib/grub/i386-pc/echo.module
 usr/lib/grub/i386-pc/efiemu.mod
@@ -158,6 +161,8 @@ usr/lib/grub/i386-pc/ehci.mod
 usr/lib/grub/i386-pc/ehci.module
 usr/lib/grub/i386-pc/elf.mod
 usr/lib/grub/i386-pc/elf.module
+usr/lib/grub/i386-pc/erofs.mod
+usr/lib/grub/i386-pc/erofs.module
 usr/lib/grub/i386-pc/eval.mod
 usr/lib/grub/i386-pc/eval.module
 usr/lib/grub/i386-pc/exfat.mod
@@ -186,6 +191,10 @@ usr/lib/grub/i386-pc/functional_test.mod
 usr/lib/grub/i386-pc/functional_test.module
 usr/lib/grub/i386-pc/gcry_arcfour.mod
 usr/lib/grub/i386-pc/gcry_arcfour.module
+usr/lib/grub/i386-pc/gcry_aria.mod
+usr/lib/grub/i386-pc/gcry_aria.module
+usr/lib/grub/i386-pc/gcry_blake2.mod
+usr/lib/grub/i386-pc/gcry_blake2.module
 usr/lib/grub/i386-pc/gcry_blowfish.mod
 usr/lib/grub/i386-pc/gcry_blowfish.module
 usr/lib/grub/i386-pc/gcry_camellia.mod
@@ -198,8 +207,14 @@ usr/lib/grub/i386-pc/gcry_des.mod
 usr/lib/grub/i386-pc/gcry_des.module
 usr/lib/grub/i386-pc/gcry_dsa.mod
 usr/lib/grub/i386-pc/gcry_dsa.module
+usr/lib/grub/i386-pc/gcry_gost28147.mod
+usr/lib/grub/i386-pc/gcry_gost28147.module
+usr/lib/grub/i386-pc/gcry_gostr3411_94.mod
+usr/lib/grub/i386-pc/gcry_gostr3411_94.module
 usr/lib/grub/i386-pc/gcry_idea.mod
 usr/lib/grub/i386-pc/gcry_idea.module
+usr/lib/grub/i386-pc/gcry_keccak.mod
+usr/lib/grub/i386-pc/gcry_keccak.module
 usr/lib/grub/i386-pc/gcry_md4.mod
 usr/lib/grub/i386-pc/gcry_md4.module
 usr/lib/grub/i386-pc/gcry_md5.mod
@@ -212,6 +227,8 @@ usr/lib/grub/i386-pc/gcry_rmd160.mod
 usr/lib/grub/i386-pc/gcry_rmd160.module
 usr/lib/grub/i386-pc/gcry_rsa.mod
 usr/lib/grub/i386-pc/gcry_rsa.module
+usr/lib/grub/i386-pc/gcry_salsa20.mod
+usr/lib/grub/i386-pc/gcry_salsa20.module
 usr/lib/grub/i386-pc/gcry_seed.mod
 usr/lib/grub/i386-pc/gcry_seed.module
 usr/lib/grub/i386-pc/gcry_serpent.mod
@@ -222,6 +239,12 @@ usr/lib/grub/i386-pc/gcry_sha256.mod
 usr/lib/grub/i386-pc/gcry_sha256.module
 usr/lib/grub/i386-pc/gcry_sha512.mod
 usr/lib/grub/i386-pc/gcry_sha512.module
+usr/lib/grub/i386-pc/gcry_sm3.mod
+usr/lib/grub/i386-pc/gcry_sm3.module
+usr/lib/grub/i386-pc/gcry_sm4.mod
+usr/lib/grub/i386-pc/gcry_sm4.module
+usr/lib/grub/i386-pc/gcry_stribog.mod
+usr/lib/grub/i386-pc/gcry_stribog.module
 usr/lib/grub/i386-pc/gcry_tiger.mod
 usr/lib/grub/i386-pc/gcry_tiger.module
 usr/lib/grub/i386-pc/gcry_twofish.mod
@@ -242,8 +265,6 @@ usr/lib/grub/i386-pc/gfxterm.mod
 usr/lib/grub/i386-pc/gfxterm.module
 usr/lib/grub/i386-pc/gfxterm_background.mod
 usr/lib/grub/i386-pc/gfxterm_background.module
-usr/lib/grub/i386-pc/gfxterm_menu.mod
-usr/lib/grub/i386-pc/gfxterm_menu.module
 usr/lib/grub/i386-pc/gptsync.mod
 usr/lib/grub/i386-pc/gptsync.module
 usr/lib/grub/i386-pc/gzio.mod
@@ -280,6 +301,8 @@ usr/lib/grub/i386-pc/json.mod
 usr/lib/grub/i386-pc/json.module
 usr/lib/grub/i386-pc/kernel.exec
 usr/lib/grub/i386-pc/kernel.img
+usr/lib/grub/i386-pc/key_protector.mod
+usr/lib/grub/i386-pc/key_protector.module
 usr/lib/grub/i386-pc/keylayouts.mod
 usr/lib/grub/i386-pc/keylayouts.module
 usr/lib/grub/i386-pc/keystatus.mod
@@ -446,6 +469,8 @@ usr/lib/grub/i386-pc/procfs.mod
 usr/lib/grub/i386-pc/procfs.module
 usr/lib/grub/i386-pc/progress.mod
 usr/lib/grub/i386-pc/progress.module
+usr/lib/grub/i386-pc/pubkey.mod
+usr/lib/grub/i386-pc/pubkey.module
 usr/lib/grub/i386-pc/pxe.mod
 usr/lib/grub/i386-pc/pxe.module
 usr/lib/grub/i386-pc/pxeboot.image
@@ -472,6 +497,8 @@ usr/lib/grub/i386-pc/relocator.mod
 usr/lib/grub/i386-pc/relocator.module
 usr/lib/grub/i386-pc/romfs.mod
 usr/lib/grub/i386-pc/romfs.module
+usr/lib/grub/i386-pc/rsa_sexp_test.mod
+usr/lib/grub/i386-pc/rsa_sexp_test.module
 usr/lib/grub/i386-pc/scsi.mod
 usr/lib/grub/i386-pc/scsi.module
 usr/lib/grub/i386-pc/search.mod
@@ -631,6 +658,10 @@ usr/lib/grub/x86_64-efi/appleldr.mod
 usr/lib/grub/x86_64-efi/appleldr.module
 usr/lib/grub/x86_64-efi/archelp.mod
 usr/lib/grub/x86_64-efi/archelp.module
+usr/lib/grub/x86_64-efi/asn1.mod
+usr/lib/grub/x86_64-efi/asn1.module
+usr/lib/grub/x86_64-efi/asn1_test.mod
+usr/lib/grub/x86_64-efi/asn1_test.module
 usr/lib/grub/x86_64-efi/at_keyboard.mod
 usr/lib/grub/x86_64-efi/at_keyboard.module
 usr/lib/grub/x86_64-efi/ata.mod
@@ -671,8 +702,10 @@ usr/lib/grub/x86_64-efi/cbtime.mod
 usr/lib/grub/x86_64-efi/cbtime.module
 usr/lib/grub/x86_64-efi/chain.mod
 usr/lib/grub/x86_64-efi/chain.module
-usr/lib/grub/x86_64-efi/cmdline_cat_test.mod
-usr/lib/grub/x86_64-efi/cmdline_cat_test.module
+usr/lib/grub/x86_64-efi/cmosdump.mod
+usr/lib/grub/x86_64-efi/cmosdump.module
+usr/lib/grub/x86_64-efi/cmostest.mod
+usr/lib/grub/x86_64-efi/cmostest.module
 usr/lib/grub/x86_64-efi/cmp.mod
 usr/lib/grub/x86_64-efi/cmp.module
 usr/lib/grub/x86_64-efi/cmp_test.mod
@@ -714,6 +747,8 @@ usr/lib/grub/x86_64-efi/div_test.mod
 usr/lib/grub/x86_64-efi/div_test.module
 usr/lib/grub/x86_64-efi/dm_nv.mod
 usr/lib/grub/x86_64-efi/dm_nv.module
+usr/lib/grub/x86_64-efi/dsa_sexp_test.mod
+usr/lib/grub/x86_64-efi/dsa_sexp_test.module
 usr/lib/grub/x86_64-efi/echo.mod
 usr/lib/grub/x86_64-efi/echo.module
 usr/lib/grub/x86_64-efi/efi_gop.mod
@@ -730,6 +765,8 @@ usr/lib/grub/x86_64-efi/ehci.mod
 usr/lib/grub/x86_64-efi/ehci.module
 usr/lib/grub/x86_64-efi/elf.mod
 usr/lib/grub/x86_64-efi/elf.module
+usr/lib/grub/x86_64-efi/erofs.mod
+usr/lib/grub/x86_64-efi/erofs.module
 usr/lib/grub/x86_64-efi/eval.mod
 usr/lib/grub/x86_64-efi/eval.module
 usr/lib/grub/x86_64-efi/exfat.mod
@@ -758,6 +795,10 @@ usr/lib/grub/x86_64-efi/functional_test.mod
 usr/lib/grub/x86_64-efi/functional_test.module
 usr/lib/grub/x86_64-efi/gcry_arcfour.mod
 usr/lib/grub/x86_64-efi/gcry_arcfour.module
+usr/lib/grub/x86_64-efi/gcry_aria.mod
+usr/lib/grub/x86_64-efi/gcry_aria.module
+usr/lib/grub/x86_64-efi/gcry_blake2.mod
+usr/lib/grub/x86_64-efi/gcry_blake2.module
 usr/lib/grub/x86_64-efi/gcry_blowfish.mod
 usr/lib/grub/x86_64-efi/gcry_blowfish.module
 usr/lib/grub/x86_64-efi/gcry_camellia.mod
@@ -770,8 +811,14 @@ usr/lib/grub/x86_64-efi/gcry_des.mod
 usr/lib/grub/x86_64-efi/gcry_des.module
 usr/lib/grub/x86_64-efi/gcry_dsa.mod
 usr/lib/grub/x86_64-efi/gcry_dsa.module
+usr/lib/grub/x86_64-efi/gcry_gost28147.mod
+usr/lib/grub/x86_64-efi/gcry_gost28147.module
+usr/lib/grub/x86_64-efi/gcry_gostr3411_94.mod
+usr/lib/grub/x86_64-efi/gcry_gostr3411_94.module
 usr/lib/grub/x86_64-efi/gcry_idea.mod
 usr/lib/grub/x86_64-efi/gcry_idea.module
+usr/lib/grub/x86_64-efi/gcry_keccak.mod
+usr/lib/grub/x86_64-efi/gcry_keccak.module
 usr/lib/grub/x86_64-efi/gcry_md4.mod
 usr/lib/grub/x86_64-efi/gcry_md4.module
 usr/lib/grub/x86_64-efi/gcry_md5.mod
@@ -784,6 +831,8 @@ usr/lib/grub/x86_64-efi/gcry_rmd160.mod
 usr/lib/grub/x86_64-efi/gcry_rmd160.module
 usr/lib/grub/x86_64-efi/gcry_rsa.mod
 usr/lib/grub/x86_64-efi/gcry_rsa.module
+usr/lib/grub/x86_64-efi/gcry_salsa20.mod
+usr/lib/grub/x86_64-efi/gcry_salsa20.module
 usr/lib/grub/x86_64-efi/gcry_seed.mod
 usr/lib/grub/x86_64-efi/gcry_seed.module
 usr/lib/grub/x86_64-efi/gcry_serpent.mod
@@ -794,6 +843,12 @@ usr/lib/grub/x86_64-efi/gcry_sha256.mod
 usr/lib/grub/x86_64-efi/gcry_sha256.module
 usr/lib/grub/x86_64-efi/gcry_sha512.mod
 usr/lib/grub/x86_64-efi/gcry_sha512.module
+usr/lib/grub/x86_64-efi/gcry_sm3.mod
+usr/lib/grub/x86_64-efi/gcry_sm3.module
+usr/lib/grub/x86_64-efi/gcry_sm4.mod
+usr/lib/grub/x86_64-efi/gcry_sm4.module
+usr/lib/grub/x86_64-efi/gcry_stribog.mod
+usr/lib/grub/x86_64-efi/gcry_stribog.module
 usr/lib/grub/x86_64-efi/gcry_tiger.mod
 usr/lib/grub/x86_64-efi/gcry_tiger.module
 usr/lib/grub/x86_64-efi/gcry_twofish.mod
@@ -812,8 +867,6 @@ usr/lib/grub/x86_64-efi/gfxterm.mod
 usr/lib/grub/x86_64-efi/gfxterm.module
 usr/lib/grub/x86_64-efi/gfxterm_background.mod
 usr/lib/grub/x86_64-efi/gfxterm_background.module
-usr/lib/grub/x86_64-efi/gfxterm_menu.mod
-usr/lib/grub/x86_64-efi/gfxterm_menu.module
 usr/lib/grub/x86_64-efi/gptsync.mod
 usr/lib/grub/x86_64-efi/gptsync.module
 usr/lib/grub/x86_64-efi/gzio.mod
@@ -850,6 +903,8 @@ usr/lib/grub/x86_64-efi/json.mod
 usr/lib/grub/x86_64-efi/json.module
 usr/lib/grub/x86_64-efi/kernel.exec
 usr/lib/grub/x86_64-efi/kernel.img
+usr/lib/grub/x86_64-efi/key_protector.mod
+usr/lib/grub/x86_64-efi/key_protector.module
 usr/lib/grub/x86_64-efi/keylayouts.mod
 usr/lib/grub/x86_64-efi/keylayouts.module
 usr/lib/grub/x86_64-efi/keystatus.mod
@@ -1012,6 +1067,8 @@ usr/lib/grub/x86_64-efi/procfs.mod
 usr/lib/grub/x86_64-efi/procfs.module
 usr/lib/grub/x86_64-efi/progress.mod
 usr/lib/grub/x86_64-efi/progress.module
+usr/lib/grub/x86_64-efi/pubkey.mod
+usr/lib/grub/x86_64-efi/pubkey.module
 usr/lib/grub/x86_64-efi/raid5rec.mod
 usr/lib/grub/x86_64-efi/raid5rec.module
 usr/lib/grub/x86_64-efi/raid6rec.mod
@@ -1032,6 +1089,8 @@ usr/lib/grub/x86_64-efi/relocator.mod
 usr/lib/grub/x86_64-efi/relocator.module
 usr/lib/grub/x86_64-efi/romfs.mod
 usr/lib/grub/x86_64-efi/romfs.module
+usr/lib/grub/x86_64-efi/rsa_sexp_test.mod
+usr/lib/grub/x86_64-efi/rsa_sexp_test.module
 usr/lib/grub/x86_64-efi/scsi.mod
 usr/lib/grub/x86_64-efi/scsi.module
 usr/lib/grub/x86_64-efi/search.mod
@@ -1093,12 +1152,16 @@ usr/lib/grub/x86_64-efi/time.mod
 usr/lib/grub/x86_64-efi/time.module
 usr/lib/grub/x86_64-efi/tpm.mod
 usr/lib/grub/x86_64-efi/tpm.module
+usr/lib/grub/x86_64-efi/tpm2_key_protector.mod
+usr/lib/grub/x86_64-efi/tpm2_key_protector.module
 usr/lib/grub/x86_64-efi/tr.mod
 usr/lib/grub/x86_64-efi/tr.module
 usr/lib/grub/x86_64-efi/trig.mod
 usr/lib/grub/x86_64-efi/trig.module
 usr/lib/grub/x86_64-efi/true.mod
 usr/lib/grub/x86_64-efi/true.module
+usr/lib/grub/x86_64-efi/tss2.mod
+usr/lib/grub/x86_64-efi/tss2.module
 usr/lib/grub/x86_64-efi/udf.mod
 usr/lib/grub/x86_64-efi/udf.module
 usr/lib/grub/x86_64-efi/ufs1.mod
@@ -1171,6 +1234,19 @@ usr/sbin/grub-probe
 usr/sbin/grub-reboot
 usr/sbin/grub-set-default
 usr/sbin/grub-sparc64-setup
+usr/share/bash-completion/completions/grub
+usr/share/bash-completion/completions/grub-bios-setup
+usr/share/bash-completion/completions/grub-editenv
+usr/share/bash-completion/completions/grub-install
+usr/share/bash-completion/completions/grub-mkconfig
+usr/share/bash-completion/completions/grub-mkfont
+usr/share/bash-completion/completions/grub-mkimage
+usr/share/bash-completion/completions/grub-mkpasswd-pbkdf2
+usr/share/bash-completion/completions/grub-probe
+usr/share/bash-completion/completions/grub-reboot
+usr/share/bash-completion/completions/grub-script-check
+usr/share/bash-completion/completions/grub-set-default
+usr/share/bash-completion/completions/grub-sparc64-setup
 #usr/share/grub
 #usr/share/grub/ascii.h
 usr/share/grub/ascii.pf2
@@ -1182,63 +1258,6 @@ usr/share/grub/unicode.pf2
 #usr/share/info/grub.info
 #usr/share/info/grub.info-1
 #usr/share/info/grub.info-2
-#usr/share/locale/ast/LC_MESSAGES/grub.mo
-#usr/share/locale/ca/LC_MESSAGES/grub.mo
-#usr/share/locale/da/LC_MESSAGES/grub.mo
-#usr/share/locale/de/LC_MESSAGES/grub.mo
-#usr/share/locale/de@hebrew
-#usr/share/locale/de@hebrew/LC_MESSAGES
-#usr/share/locale/de@hebrew/LC_MESSAGES/grub.mo
-#usr/share/locale/de_CH
-#usr/share/locale/de_CH/LC_MESSAGES
-#usr/share/locale/de_CH/LC_MESSAGES/grub.mo
-#usr/share/locale/en@arabic
-#usr/share/locale/en@arabic/LC_MESSAGES
-#usr/share/locale/en@arabic/LC_MESSAGES/grub.mo
-#usr/share/locale/en@cyrillic
-#usr/share/locale/en@cyrillic/LC_MESSAGES
-#usr/share/locale/en@cyrillic/LC_MESSAGES/grub.mo
-#usr/share/locale/en@greek
-#usr/share/locale/en@greek/LC_MESSAGES
-#usr/share/locale/en@greek/LC_MESSAGES/grub.mo
-#usr/share/locale/en@hebrew
-#usr/share/locale/en@hebrew/LC_MESSAGES
-#usr/share/locale/en@hebrew/LC_MESSAGES/grub.mo
-#usr/share/locale/en@piglatin
-#usr/share/locale/en@piglatin/LC_MESSAGES
-#usr/share/locale/en@piglatin/LC_MESSAGES/grub.mo
-#usr/share/locale/en@quot/LC_MESSAGES/grub.mo
-#usr/share/locale/eo/LC_MESSAGES/grub.mo
-#usr/share/locale/es/LC_MESSAGES/grub.mo
-#usr/share/locale/fi/LC_MESSAGES/grub.mo
-#usr/share/locale/fr/LC_MESSAGES/grub.mo
-#usr/share/locale/gl/LC_MESSAGES/grub.mo
-#usr/share/locale/he/LC_MESSAGES/grub.mo
-#usr/share/locale/hr/LC_MESSAGES/grub.mo
-#usr/share/locale/hu/LC_MESSAGES/grub.mo
-#usr/share/locale/id/LC_MESSAGES/grub.mo
-#usr/share/locale/it/LC_MESSAGES/grub.mo
-#usr/share/locale/ja/LC_MESSAGES/grub.mo
-#usr/share/locale/ka/LC_MESSAGES/grub.mo
-#usr/share/locale/ko/LC_MESSAGES/grub.mo
-#usr/share/locale/lg/LC_MESSAGES/grub.mo
-#usr/share/locale/lt/LC_MESSAGES/grub.mo
-#usr/share/locale/nb/LC_MESSAGES/grub.mo
-#usr/share/locale/nl/LC_MESSAGES/grub.mo
-#usr/share/locale/pa/LC_MESSAGES/grub.mo
-#usr/share/locale/pl/LC_MESSAGES/grub.mo
-#usr/share/locale/pt/LC_MESSAGES/grub.mo
-#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo
-#usr/share/locale/ro/LC_MESSAGES/grub.mo
-#usr/share/locale/ru/LC_MESSAGES/grub.mo
-#usr/share/locale/sl/LC_MESSAGES/grub.mo
-#usr/share/locale/sr/LC_MESSAGES/grub.mo
-#usr/share/locale/sv/LC_MESSAGES/grub.mo
-#usr/share/locale/tr/LC_MESSAGES/grub.mo
-#usr/share/locale/uk/LC_MESSAGES/grub.mo
-#usr/share/locale/vi/LC_MESSAGES/grub.mo
-#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo
-#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo
 #usr/share/man/man1/grub-editenv.1
 #usr/share/man/man1/grub-file.1
 #usr/share/man/man1/grub-fstest.1
@@ -1253,6 +1272,7 @@ usr/share/grub/unicode.pf2
 #usr/share/man/man1/grub-mkrelpath.1
 #usr/share/man/man1/grub-mkrescue.1
 #usr/share/man/man1/grub-mkstandalone.1
+#usr/share/man/man1/grub-protect.1
 #usr/share/man/man1/grub-render-label.1
 #usr/share/man/man1/grub-script-check.1
 #usr/share/man/man1/grub-syslinux2cfg.1
diff --git a/lfs/grub b/lfs/grub
index 91dda242c..2ff91f7ee 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.12
+VER        = 0e36779-bootstrapped
 
 THISAPP    = grub-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -61,7 +61,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
 
-$(DL_FILE)_BLAKE2 = a678f7fafb945d325c8cf47aa086f48357a8f6335b762f77038c30a3896b3b05491598d9931d5335841d224fffcbe4a9a43ca1479057c1f1ce52b8d2a952c431
+$(DL_FILE)_BLAKE2 = 4e006b3e852403eaed348de188406656a6d8cdff14a1394dd7cf3ada45218e4f4cfd3ee4a4b235633cbee7ea87a49a267c44e48105095ebb13d8192382bd8ce2
 unifont-7.0.03.pcf.gz_BLAKE2 = fb96c1786fcc8c77796c90ce30a2b7d544013bd62cedbf7b027e1894fe75cdbd2044717796cb0e3150db1457fcb58076491d9c0b855621b652fb9a52c0793469
 
 install : $(TARGET)
@@ -96,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.02_disable_vga_fallback.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.12-Use-medany-instead-of-large-model-for-RISCV.patch
 	cd $(DIR_APP) && [ ! -e grub-core/extra_deps.lst ] && echo 'depends bli part_gpt' > grub-core/extra_deps.lst
-	cd $(DIR_APP) && autoreconf -vfi
+	#cd $(DIR_APP) && autoreconf -vfi
 
 	# Install unifont
 	cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz
