30_os-prober: Properly handle multiple initrd paths
PATCH 1/1 30_os-prober: Properly handle multiple initrd paths
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
--- util/grub.d/30_os-prober.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
util/grub.d/30_os-prober.in +1 -1
@@ -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
Signature · 1 line
2.34.1
Quoted 27 lines · 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 <[email protected]>--- util/grub.d/30_os-prober.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)util/grub.d/30_os-prober.in +1
-2@@ -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 --
Quoted 3 lines
2.34.1
Any feedback?
Quoted 7 lines · 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
This looks like a random number. Could you send me link to the bug?
And it should be:
... instead of Closes...
Quoted 1 line
Signed-off-by Peter Levine <[email protected]>
Otherwise Reviewed-by: Daniel Kiper <[email protected]>...
Daniel