Re: [PATCH] If $hints is not set, we can reduce the output into grub.cfg from 5 lines to just 1 line.

[Daniel Kiper]

On Tue, Sep 01, 2020 at 07:13:20AM +0200, Florian La Roche via Grub-devel wrote:

Missing SOB as previously... I can add it on your behalf if you are OK
with it. Otherwise Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

> ---
>  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"
>  }

Daniel