The attached patch reduces the output into grub.cfg from 5 lines into
1 if $hints is not set within grub-mkconfig_lib.in and this is reused
several times.
best regards and thanks for grub,
Florian La Roche
From 1c2d980679b7d5e6f720006ace00e9bdd134e524 Mon Sep 17 00:00:00 2001
From: Florian La Roche <florian.laro...@gmail.com>
Date: Mon, 31 Aug 2020 10:14:58 +0200
Subject: [PATCH] If $hints is not set, we can reduce the output into grub.cfg
from 5 lines to just 1 line.
---
util/grub-mkconfig_lib.in | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 2d80f14bf..301d1ac22 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -158,11 +158,15 @@ prepare_grub_to_access_device ()
fi
if [ "x${GRUB_DISABLE_UUID}" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then
hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=
- echo "if [ x\$feature_platform_search_hint = xy ]; then"
- echo " search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
- echo "else"
- echo " search --no-floppy --fs-uuid --set=root ${fs_uuid}"
- echo "fi"
+ if [ "x$hints" != x ]; then
+ echo "if [ x\$feature_platform_search_hint = xy ]; then"
+ echo " search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
+ echo "else"
+ echo " search --no-floppy --fs-uuid --set=root ${fs_uuid}"
+ echo "fi"
+ else
+ echo "search --no-floppy --fs-uuid --set=root ${fs_uuid}"
+ fi
fi
IFS="$old_ifs"
}
--
2.28.0
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
