Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2018-10-09 15:52:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober" Tue Oct 9 15:52:15 2018 rev:46 rq:639760 version:1.74 Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2018-06-18 13:49:15.727514228 +0200 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-10-09 15:53:05.366359352 +0200 @@ -1,0 +2,6 @@ +Tue Jul 31 09:16:55 UTC 2018 - mch...@suse.com + +- UEFI Grub does not insert Arch Linux entry correctly (boo#1101942) + * os-prober-multiple-initrd.patch + +------------------------------------------------------------------- New: ---- os-prober-multiple-initrd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.zdACuu/_old 2018-10-09 15:53:05.918358699 +0200 +++ /var/tmp/diff_new_pack.zdACuu/_new 2018-10-09 15:53:05.918358699 +0200 @@ -1,7 +1,7 @@ # # spec file for package os-prober # -# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Version: 1.74 Release: 0 Summary: Probes disks on the system for installed operating systems -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Boot Url: http://kitenet.net/~joey/code/os-prober/ Source0: http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.xz @@ -66,6 +66,8 @@ Patch24: os-prober-linux-distro-parse-os-release.patch # PATCH-FIX-OPENSUSE: Windows 10 is not listed in the grub menu (bsc#1076779) Patch25: os-prober-05efi-blkid.patch +# PATCH-FIX-OPENSUSE: UEFI Grub does not insert Arch Linux entry correctly (boo#1101942) +Patch26: os-prober-multiple-initrd.patch Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe @@ -109,6 +111,7 @@ %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 find . -name \*.orig -delete %build ++++++ os-prober-multiple-initrd.patch ++++++ Index: os-prober/linux-boot-probes/mounted/common/40grub2 =================================================================== --- os-prober.orig/linux-boot-probes/mounted/common/40grub2 +++ os-prober/linux-boot-probes/mounted/common/40grub2 @@ -19,11 +19,11 @@ entry_result () { # if path is not relative to subvolume make it relative kernel=${kernel#${bsv}} kernelfile=$kernel - initrd=${initrd#${bsv}} + initrd=`echo $initrd | sed -e "s!^${bsv}!!" -e "s!\\(\\s\\)${bsv}!\\1!g"` if [ "x$GRUB_FS" != "xbtrfs" -o "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" != "xtrue" ]; then # absolute path needed: prepend subvolume if $kernel isn't empty kernel=${kernel:+${bsv}}${kernel} - initrd=${initrd:+${bsv}}${initrd} + initrd=`echo $initrd | sed -e "s!\\(\\S\\+\\)!${bsv}\\1!g"` fi # assumed: rootsv != bootsv if rootsv isn't ancestor of bootsv [ "$partition" != "$bootpart" -o "$rootsv" != "$bootsv" ] && kernelfile="/boot${kernelfile}" @@ -105,10 +105,11 @@ parse_grub_menu () { fi ;; initrd|initrdefi|initrd16) - initrd="$(echo "$2" | sed 's/(.*)//')" + shift + initrd="$(echo "$@" | sed 's/(\S*)//g')" # Initrd same. if [ "$partition" != "$bootpart" -a "$type" != "btrfs" ]; then - initrd="/boot$initrd" + initrd=`echo $initrd | sed -e 's!\(\S\+\)!/boot\1!g'` fi ;; "}")
