rpm/os-prober
SHA256
1
0
Fork 0
forked from pool/os-prober
Code Pull Requests Activity

Accepting request 580557 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/580557
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/os-prober?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger 2018-03-01 11:06:53 +00:00 committed by Git OBS Bridge
commit beb0e14948
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
os-prober-05efi-blkid.patch Normal file
View File

@ -0,0 +1,18 @@
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"

7
os-prober.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Fri Feb 23 04:40:59 UTC 2018 - mchang@suse.com

3
os-prober.spec
View File

@ -64,6 +64,8 @@ Patch22: os-prober-btrfs-always-detect-default.patch
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 @@ cp %{SOURCE1} .
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
find . -name \*.orig -delete
%build