Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-02-05 10:44:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and      /work/SRC/openSUSE:Factory/.os-prober.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "os-prober"

Mon Feb  5 10:44:55 2018 rev:42 rq:571875 version:1.74

Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes      2017-03-05 
17:58:21.911703907 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-02-05 
10:44:56.858954509 +0100
@@ -1,0 +2,6 @@
+Wed Jan 31 09:46:34 UTC 2018 - mch...@suse.com
+
+- Fix Windows not listed in grub menu after install or upgrade (bsc#1076779)
+  * os-prober-05efi-udevinfo.patch
+
+-------------------------------------------------------------------

New:
----
  os-prober-05efi-udevinfo.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.VKUZZg/_old  2018-02-05 10:44:57.842908440 +0100
+++ /var/tmp/diff_new_pack.VKUZZg/_new  2018-02-05 10:44:57.842908440 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2017 SUSE LINUX 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
@@ -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-udevinfo.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-udevinfo.patch ++++++
Index: os-prober/os-probes/mounted/x86/05efi
===================================================================
--- os-prober.orig/os-probes/mounted/x86/05efi
+++ os-prober/os-probes/mounted/x86/05efi
@@ -28,7 +28,7 @@ if type udevadm > /dev/null 2>&1; then
 fi
 
 if type udevinfo > /dev/null 2>&1; then
-       eval "$(udevinfo -q property -n "$partition" | grep -E 
'^(MD_CONTAINER|ID_PART_ENTRY_(TYPE|SCHEME))=')"
+       eval "$(udevinfo -q property -n "$partition" | sed -n -e 
's/\(.*\)=\(.*\)/\1="\2"/p' | grep -E 
'^(MD_CONTAINER|ID_PART_ENTRY_(TYPE|SCHEME)|PARTNAME)=')"
        debug "$partition container is '$MD_CONTAINER'"
 
        # Skip virtual devices unless they are known SW-RAID
@@ -48,13 +48,16 @@ if type udevinfo > /dev/null 2>&1; then
 
        debug "$partition partition scheme is $ID_PART_ENTRY_SCHEME"
        debug "$partition partition type is $ID_PART_ENTRY_TYPE"
+       debug "$partition partition name is $PARTNAME"
 
        if [ -z "$ID_PART_ENTRY_TYPE" -o -z "$ID_PART_ENTRY_SCHEME" -o \
                \( "$ID_PART_ENTRY_SCHEME" != gpt -a "$ID_PART_ENTRY_SCHEME" != 
dos \) -o \
                \( "$ID_PART_ENTRY_SCHEME" = gpt -a "$ID_PART_ENTRY_TYPE" != 
c12a7328-f81f-11d2-ba4b-00a0c93ec93b \) -o \
                \( "$ID_PART_ENTRY_SCHEME" = dos -a "$ID_PART_ENTRY_TYPE" != 
0xef \) ]; then
-               debug "$partition is not a ESP partition: exiting"
-               exit 1
+               if [ -z "$PARTNAME" -o  "$PARTNAME" != "EFI system partition" 
]; then
+                       debug "$partition is not a ESP partition: exiting"
+                       exit 1
+               fi
        fi
 else
        debug "udevinfo and udevadm missing - cannot check partition type"

Reply via email to