Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2015-08-07 00:17:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2015-07-05 17:51:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-08-07 00:17:01.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Aug 2 15:14:55 UTC 2015 - [email protected] + +- add os-prober-40grub-check-grub2.patch + * also skip legacy grub if /boot/grub2/grub.cfg is present, not only + /boot/grub/grub.cfg + +------------------------------------------------------------------- New: ---- os-prober-40grub-check-grub2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.NaDFv9/_old 2015-08-07 00:17:02.000000000 +0200 +++ /var/tmp/diff_new_pack.NaDFv9/_new 2015-08-07 00:17:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package os-prober # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -60,6 +60,8 @@ Patch17: Improve-btrfs-handling-on-os-probing-for-grub2.patch # PATCH-FIX-SLE: fix os-prober mount error, no such file or directory (bsc#931955) Patch18: os-prober-btrfs-absolute-subvol.patch +# PATCH-FIX-OPENSUSE: also skip legacy grub if /boot/grub2/grub.cfg is present +Patch19: os-prober-40grub-check-grub2.patch Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe @@ -99,6 +101,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 find . -name \*.orig -delete %build ++++++ os-prober-40grub-check-grub2.patch ++++++ From: Andrei Borzenkov <[email protected]> Subject: Also skip legacy grub if grub2 is found Check for grub.cfg also in /boot/grub2, not only in /boot/grub. Index: os-prober/linux-boot-probes/mounted/x86/40grub =================================================================== --- os-prober.orig/linux-boot-probes/mounted/x86/40grub +++ os-prober/linux-boot-probes/mounted/x86/40grub @@ -95,7 +95,9 @@ fi if [ "$grubconf" ] && \ ([ ! -e "$mpoint/boot/grub/grub.cfg" ] || \ - [ "$mpoint/boot/grub/$grubconf" -nt "$mpoint/boot/grub/grub.cfg" ]); then + [ "$mpoint/boot/grub/$grubconf" -nt "$mpoint/boot/grub/grub.cfg" ]) && \ + ([ ! -e "$mpoint/boot/grub2/grub.cfg" ] || \ + [ "$mpoint/boot/grub/$grubconf" -nt "$mpoint/boot/grub2/grub.cfg" ]); then debug "parsing $grubconf" parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub/$grubconf" fi
