SHA256
1
0
forked from pool/grub2
grub2/grub2-util-30_os-prober-multiple-initrd.patch
Andrei Borzenkov 12c25b73bf Accepting request 639716 from home:michael-chang:branches:Base:System
- Translate caret back to space as the initrd stanza could use space to
  delimit multiple files loaded (bsc#1101942)
  * grub2-util-30_os-prober-multiple-initrd.patch

OBS-URL: https://build.opensuse.org/request/show/639716
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=316
2018-10-03 09:09:37 +00:00

23 lines
883 B
Diff

Index: grub-2.02/util/grub.d/30_os-prober.in
===================================================================
--- grub-2.02.orig/util/grub.d/30_os-prober.in
+++ grub-2.02/util/grub.d/30_os-prober.in
@@ -216,7 +216,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
@@ -225,7 +225,7 @@ EOF
if [ "${LROOT}" != "${LBOOT}" ]; then
LKERNEL="${LKERNEL#/boot}"
- LINITRD="${LINITRD#/boot}"
+ LINITRD="$(echo $LINITRD | sed -e 's!^/boot!!' -e 's!\(\s\)/boot!\1!g')"
fi
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"