summaryrefslogtreecommitdiffstats
path: root/pyanaconda/bootloader.py
diff options
context:
space:
mode:
authorBrian C. Lane <bcl@redhat.com>2012-04-09 15:46:35 -0700
committerBrian C. Lane <bcl@redhat.com>2012-04-09 16:50:54 -0700
commit92660f3bf18e37acf8dce569484af603f17fb68a (patch)
treefe2239c69ca56d92b96f0d1bbc915130b72795d6 /pyanaconda/bootloader.py
parentbda04cafef49a6cb14547388d6ce740b3e0c2a77 (diff)
downloadanaconda-92660f3bf18e37acf8dce569484af603f17fb68a.tar.gz
anaconda-92660f3bf18e37acf8dce569484af603f17fb68a.tar.xz
anaconda-92660f3bf18e37acf8dce569484af603f17fb68a.zip
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
Diffstat (limited to 'pyanaconda/bootloader.py')
-rw-r--r--pyanaconda/bootloader.py6
1 files changed, 6 insertions, 0 deletions
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