commit os-prober for openSUSE:Factory
Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2018-03-01 12:06:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-prober" Thu Mar 1 12:06:53 2018 rev:44 rq:580557 version:1.74 Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2018-02-25 11:32:54.611210405 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-03-01 12:06:54.884023726 +0100 @@ -1,0 +2,7 @@ +Mon Feb 26 07:34:02 UTC 2018 - mchang@suse.com + +- Use blkid to bailout udevinfo for db not imported in chroot + environment (bsc#1076779) + * os-prober-05efi-blkid.patch + +------------------------------------------------------------------- New: ---- os-prober-05efi-blkid.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.jC1xS0/_old 2018-03-01 12:06:55.528000613 +0100 +++ /var/tmp/diff_new_pack.jC1xS0/_new 2018-03-01 12:06:55.532000470 +0100 @@ -64,6 +64,8 @@ Patch23: os-prober-linux-distro-avoid-expensive-ld-file-test.patch # PATCH-FIX-OPENSUSE: Leap does not recognize Tumbleweed any more (bsc#997465) 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 Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe @@ -106,6 +108,7 @@ %patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 find . -name \*.orig -delete %build ++++++ os-prober-05efi-blkid.patch ++++++ Index: os-prober/os-probes/mounted/x86/05efi =================================================================== --- os-prober.orig/os-probes/mounted/x86/05efi +++ os-prober/os-probes/mounted/x86/05efi @@ -46,6 +46,13 @@ if type udevinfo > /dev/null 2>&1; then fi fi + # udev may not work in chroot as its db may not be there, bailout that by blkid (bsc#1076779) + if [ -z "$ID_PART_ENTRY_TYPE" -a -z "$ID_PART_ENTRY_SCHEME" ] && + type blkid > /dev/null 2>&1; then + debug "fallback to blkid" + eval "$(blkid -p -o udev "$partition" | grep -E '^(ID_PART_ENTRY_(TYPE|SCHEME))=')" + fi + debug "$partition partition scheme is $ID_PART_ENTRY_SCHEME" debug "$partition partition type is $ID_PART_ENTRY_TYPE"
participants (1)
-
root@hilbert.suse.de