From d4c6f995310b29e79b5fa76dcfc66edab07ebecf Mon Sep 17 00:00:00 2001
From: livio <livio@codeberg.org>
Date: Sat, 30 Mar 2024 21:24:18 +0100
Subject: [PATCH] Moved file system check out of GRUB menu function as it's
necessary for any bootloader0
---
config/grub/config/grub.cfg | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/config/grub/config/grub.cfg b/config/grub/config/grub.cfg
index 478a6e80..e4bc7296 100644
--- a/config/grub/config/grub.cfg
+++ b/config/grub/config/grub.cfg
@@ -91,7 +91,11 @@ function list_lmedia {
# Create menuitems that boot any valid previously detected media
function make_boot_menus {
for i in ${tgt_medias}; do
- grub_create_menu ${i}
+ if [ ! -d ${i}/ ]; then # Root is invalid: maybe unsupported FS or encrypted one
+ cryptomount ${i}
+ else
+ grub_create_menu ${i} # Look for grub entries in known directories
+ fi
echo -n "."
done
echo
@@ -139,10 +143,6 @@ function grub_menuentry {
function grub_create_menu {
set root="${1}"
- if [ ! -d / ]; then # Root is invalid: maybe unknown FS or encrypted one
- cryptomount ${1}
- return;
- fi
for dir in ${grub_dirs}; do
# In order to save time, we do not attempt anything on non existing directory.
if [ -d /"${dir}"/ ]; then
--
GitLab