From 92660f3bf18e37acf8dce569484af603f17fb68a Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 9 Apr 2012 15:46:35 -0700
Subject: check for valid mountpoints (#748209)

_is_valid_format needs to also check the mountpoints to make sure
they are valid. Without this it will accept a previously formatted
EFI fs and let the install continue without having it mounted on
/boot/efi
---
 pyanaconda/bootloader.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index a158042e5..9dca2e223 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -523,6 +523,12 @@ class BootLoader(object):
                                % (desc, device.format.type))
             ret = False
 
+        if mountpoints and hasattr(device.format, "mountpoint") \
+           and device.format.mountpoint not in mountpoints:
+            self.errors.append(_("%s must be mounted on one of %s.")
+                               % (desc, ", ".join(mountpoints)))
+            ret = False
+
         log.debug("_is_valid_format(%s) returning %s" % (device.name,ret))
         return ret
 
-- 
cgit