SHA256
1
0
forked from pool/os-prober
os-prober/os-prober-accept-ESP-on-IMSM.patch
Andrei Borzenkov 291be643b3 Accepting request 640741 from home:michael-chang:os-prober-1.76
- Version bump to 1.76:
  * Fix check on ID_PART_ENTRY_SCHEME, to look for "dos" instead of "msdos"
  * Remove code using device mapper
  * This also removes the dependency on dmsetup
- Rediff
  * os-prober-1.49-grub2-mount.patch
  * os-prober-accept-ESP-on-IMSM.patch
  * os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
  * os-prober-fix-btrfs-subvol-mounted-tests.patch

OBS-URL: https://build.opensuse.org/request/show/640741
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=87
2018-10-10 17:52:55 +00:00

34 lines
1.2 KiB
Diff

Index: os-prober-1.76/os-probes/mounted/x86/05efi
===================================================================
--- os-prober-1.76.orig/os-probes/mounted/x86/05efi
+++ os-prober-1.76/os-probes/mounted/x86/05efi
@@ -28,13 +28,24 @@ 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"