pool/os-prober
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 196124 from home:arvidjaar:branches:Base:System

Browse Source 
- add os-prober-accept-ESP-on-IMSM.patch
  * accept EFI partition on IMSM MD array (bnc#818871)
  * fix DOS partition table detection

OBS-URL: https://build.opensuse.org/request/show/196124
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=29
This commit is contained in:
Michael Chang 2013-08-26 02:23:39 +00:00 committed by Git OBS Bridge
parent f4287cc9b1
commit 922c49de2f
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
os-prober-accept-ESP-on-IMSM.patch Normal file
View File

@ -0,0 +1,42 @@
Index: os-prober-1.61/os-probes/mounted/x86/05efi
===================================================================
--- os-prober-1.61.orig/os-probes/mounted/x86/05efi
+++ os-prober-1.61/os-probes/mounted/x86/05efi
@@ -28,20 +28,31 @@ if type udevadm > /dev/null 2>&1; then
fi
if type udevinfo > /dev/null 2>&1; then
- # Skip virtual devices
+ eval "$(udevinfo -q property -n "$partition" | grep -E '^(MD_CONTAINER|ID_PART_ENTRY_(TYPE|SCHEME))=')"
+ debug "$partition container is '$MD_CONTAINER'"
+
+ # Skip virtual devices unless they are known SW-RAID
if udevinfo -q path -n $partition | grep -q /virtual/; then
- debug "$1 is virtual device: exiting"
- exit 1
+ # Check for Intel Matrix array
+ if [ -n "$MD_CONTAINER" ]; then
+ eval "$(udevinfo -q property -n "$MD_CONTAINER" | grep -E '^MD_METADATA=')"
+ debug "$MD_CONTAINER metadata is '$MD_METADATA'"
+ fi
+ if [ "$MD_METADATA" = imsm ]; then
+ debug "$partition is on IMSM array"
+ else
+ debug "$1 is virtual device: exiting"
+ exit 1
+ fi
fi
- eval "$(udevinfo -q property -n "$partition" | grep -E '^ID_PART_ENTRY_(TYPE|SCHEME)=')"
debug "$partition partition scheme is $ID_PART_ENTRY_SCHEME"
debug "$partition partition type is $ID_PART_ENTRY_TYPE"
if [ -z "$ID_PART_ENTRY_TYPE" -o -z "$ID_PART_ENTRY_SCHEME" -o \
- \( "$ID_PART_ENTRY_SCHEME" != gpt -a "$ID_PART_ENTRY_SCHEME" != msdos \) -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" = msdos -a "$ID_PART_ENTRY_TYPE" != 0xef \) ]; then
+ \( "$ID_PART_ENTRY_SCHEME" = dos -a "$ID_PART_ENTRY_TYPE" != 0xef \) ]; then
debug "$partition is not a ESP partition: exiting"
exit 1
fi

6
os-prober.changes
View File

@ -1,4 +1,10 @@
-------------------------------------------------------------------
Sun Aug 18 18:54:20 UTC 2013 - arvidjaar@gmail.com
- add os-prober-accept-ESP-on-IMSM.patch
* accept EFI partition on IMSM MD array (bnc#818871)
* fix DOS partition table detection
Fri May 31 10:26:48 UTC 2013 - arvidjaar@gmail.com
- update to os-prober 1.61. Highlights:

3
os-prober.spec
View File

@ -45,6 +45,8 @@ Patch8: os-prober-linux-secure-boot.patch
Patch9: os-prober-btrfsfix.patch
# PATCH-FIX-OPENSUSE: difference between upstream and our previous scripts
Patch10: os-prober-EFI-openSUSEfy.patch
# PATCH-FIX-OPENSUSE: accept ESP on IMSM MD raid (bnc#818871)
Patch11: os-prober-accept-ESP-on-IMSM.patch
Requires: /bin/grep
Requires: /bin/sed
@ -72,6 +74,7 @@ cp %SOURCE1 .
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%build
make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"