Recognise the new ignore_uefi flag from partman-efi

diff --git a/debian/changelog b/debian/changelog
index 1499695..84a81e4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+os-prober (1.65) unstable; urgency=medium
+
+  [ Steve McIntyre ]
+  * Recognise the new ignore_uefi flag from partman-efi.
+
+ -- Steve McIntyre <93sam@debian.org>  Wed, 01 Oct 2014 01:42:22 +0100
+
 os-prober (1.64) unstable; urgency=medium
 
   [ Frederic Bonnard ]

diff --git a/os-probes/mounted/x86/05efi b/os-probes/mounted/x86/05efi
index e77ca6d..93309ce 100755 (executable)
--- a/os-probes/mounted/x86/05efi
+++ b/os-probes/mounted/x86/05efi
@@ -8,7 +8,7 @@ mpoint="$2"
 type="$3"
 
 # This file is for UEFI platform only
-if [ ! -d /sys/firmware/efi ]; then
+if [ ! -d /sys/firmware/efi ] || [ -f /var/lib/partman/ignore_uefi ]; then
        debug "Not on UEFI platform"
        exit 1
 fi

diff --git a/os-probes/mounted/x86/20microsoft b/os-probes/mounted/x86/20microsoft
index bf829d9..6fb3cc5 100755 (executable)
--- a/os-probes/mounted/x86/20microsoft
+++ b/os-probes/mounted/x86/20microsoft
@@ -8,7 +8,7 @@ mpoint="$2"
 type="$3"
 
 # This script looks for legacy BIOS bootloaders only. Skip if running UEFI
-if [ -d /sys/firmware/efi ]; then
+if [ -d /sys/firmware/efi ] && [ ! -f /var/lib/partman/ignore_uefi ]; then
        debug "Skipping legacy bootloaders on UEFI system"
        exit 1
 fi