Fix check on ID_PART_ENTRY_SCHEME, to look for "dos" instead of "msdos" (Closes:...

This was tracked down from udevadm (systemd) to the blkid_partition_get_table
function in util-linux, libblkid/src/partitions/dos.c is indeed about "dos"
rather than "msdos".

diff --git a/debian/changelog b/debian/changelog
index 3a291ee..a815f7e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+os-prober (1.76) UNRELEASED; urgency=medium
+
+  * os-probes/mounted/x86/05efi: Fix check on ID_PART_ENTRY_SCHEME, to
+    look for "dos" instead of "msdos" (Closes: #817023).
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 24 Jun 2017 19:38:49 +0200
+
 os-prober (1.75) unstable; urgency=medium
 
   * Remove code using device mapper (Closes: #860833, #853927, #853163).

diff --git a/os-probes/mounted/x86/05efi b/os-probes/mounted/x86/05efi
index 93309ce..fcf3697 100755 (executable)
--- a/os-probes/mounted/x86/05efi
+++ b/os-probes/mounted/x86/05efi
@@ -39,9 +39,9 @@ if type udevinfo > /dev/null 2>&1; then
        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