Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2013-08-28 21:16:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2013-06-19 14:53:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-08-28 21:16:36.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 18 18:54:20 UTC 2013 - arvidj...@gmail.com + +- add os-prober-accept-ESP-on-IMSM.patch + * accept EFI partition on IMSM MD array (bnc#818871) + * fix DOS partition table detection + New: ---- os-prober-accept-ESP-on-IMSM.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.M0fMBi/_old 2013-08-28 21:16:37.000000000 +0200 +++ /var/tmp/diff_new_pack.M0fMBi/_new 2013-08-28 21:16:37.000000000 +0200 @@ -45,6 +45,8 @@ 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 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}" ++++++ os-prober-accept-ESP-on-IMSM.patch ++++++ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org