vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

grub-mkconfig: If $hints is not set reduce the output into grub.cfg to just 1 line

Browse source 
Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Florian La Roche 2020-09-01 07:13:20 +02:00 committed by Daniel Kiper
parent c55480daca
commit 3ec59f14f4
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
util/grub-mkconfig_lib.in
View file

@ -158,11 +158,15 @@ prepare_grub_to_access_device ()
fi fi
if [ "x${GRUB_DISABLE_UUID}" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then 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= hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=
echo "if [ x\$feature_platform_search_hint = xy ]; then" if [ "x$hints" != x ]; then
echo " search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}" echo "if [ x\$feature_platform_search_hint = xy ]; then"
echo "else" echo " search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
echo " search --no-floppy --fs-uuid --set=root ${fs_uuid}" echo "else"
echo "fi" 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 fi
IFS="$old_ifs" IFS="$old_ifs"
} }