[PATCH] 30_os-prober: Properly handle multiple initrd paths

[PATCH] 30_os-prober: Properly handle multiple initrd paths

[Peter Levine]

os-prober now effectively handles multiple paths passed to initrd, but
grub-mkconfig still truncates off any subsequent space-delimited paths.

Support proper parsing of space-delimited initrd paths passed from
os-prober for distributions, like Manjaro, that require it.

Closes 47681

Signed-off-by: Peter Levine <plevine457@gmail.com>
---
 util/grub.d/30_os-prober.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 5984e92d2..daa603778 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -210,7 +210,7 @@ EOF
         LBOOT="`echo ${LINUX} | cut -d ':' -f 2`"
         LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`"
         LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`"
-        LINITRD="`echo ${LINUX} | cut -d ':' -f 5`"
+        LINITRD="`echo ${LINUX} | cut -d ':' -f 5 | tr '^' ' '`"
         LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`"
 
         if [ -z "${LLABEL}" ] ; then
-- 
2.34.1

Re: [PATCH] 30_os-prober: Properly handle multiple initrd paths

[P Levine]

[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]

On Tue, Dec 21, 2021 at 11:47 PM Peter Levine <plevine457@gmail.com> wrote:

> os-prober now effectively handles multiple paths passed to initrd, but
> grub-mkconfig still truncates off any subsequent space-delimited paths.
>
> Support proper parsing of space-delimited initrd paths passed from
> os-prober for distributions, like Manjaro, that require it.
>
> Closes 47681
>
> Signed-off-by: Peter Levine <plevine457@gmail.com>
> ---
>  util/grub.d/30_os-prober.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
> index 5984e92d2..daa603778 100644
> --- a/util/grub.d/30_os-prober.in
> +++ b/util/grub.d/30_os-prober.in
> @@ -210,7 +210,7 @@ EOF
>          LBOOT="`echo ${LINUX} | cut -d ':' -f 2`"
>          LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`"
>          LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`"
> -        LINITRD="`echo ${LINUX} | cut -d ':' -f 5`"
> +        LINITRD="`echo ${LINUX} | cut -d ':' -f 5 | tr '^' ' '`"
>          LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`"
>
>          if [ -z "${LLABEL}" ] ; then
> --
> 2.34.1
>
>
Any feedback?

[-- Attachment #2: Type: text/html, Size: 2417 bytes --]

Re: [PATCH] 30_os-prober: Properly handle multiple initrd paths

[Daniel Kiper]

On Tue, Dec 21, 2021 at 11:47:45PM -0500, Peter Levine wrote:
> os-prober now effectively handles multiple paths passed to initrd, but
> grub-mkconfig still truncates off any subsequent space-delimited paths.
>
> Support proper parsing of space-delimited initrd paths passed from
> os-prober for distributions, like Manjaro, that require it.
>
> Closes 47681

This looks like a random number. Could you send me link to the bug?

And it should be:

Fixes: ...

... instead of Closes...

> Signed-off-by: Peter Levine <plevine457@gmail.com>

Otherwise Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>...

Daniel