diff --git a/grub2-util-30_os-prober-multiple-initrd.patch b/grub2-util-30_os-prober-multiple-initrd.patch new file mode 100644 index 0000000..9fbb142 --- /dev/null +++ b/grub2-util-30_os-prober-multiple-initrd.patch @@ -0,0 +1,22 @@ +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}")" diff --git a/grub2.changes b/grub2.changes index 3b1a293..256c330 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 3 07:08:14 UTC 2018 - mchang@suse.com + +- 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 + ------------------------------------------------------------------- Wed Sep 26 08:01:05 UTC 2018 - mchang@suse.com diff --git a/grub2.spec b/grub2.spec index e850828..cf199d3 100644 --- a/grub2.spec +++ b/grub2.spec @@ -221,6 +221,7 @@ Patch88: unix-exec-avoid-atexit-handlers-when-child-exits.patch Patch89: 0001-xfs-Accept-filesystem-with-sparse-inodes.patch Patch90: grub2-binutils2.31.patch Patch91: grub2-msdos-fix-overflow.patch +Patch92: grub2-util-30_os-prober-multiple-initrd.patch # Btrfs snapshot booting related patches Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch Patch102: grub2-btrfs-02-export-subvolume-envvars.patch @@ -519,6 +520,7 @@ swap partition while in resuming %patch89 -p1 %patch90 -p1 %patch91 -p1 +%patch92 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1