diff options
| author | Peter Jones <pjones@redhat.com> | 2008-04-08 16:26:47 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@pjones2.localdomain> | 2008-04-08 16:26:47 -0400 |
| commit | 441ccff98ec88d3ecfc9c6926ff2e0d17801678f (patch) | |
| tree | 2fa20b267ad1e25eca8c29ea32b440c84ab7c03e /autopart.py | |
| parent | 0e99c67a851958fb9baace398e66216782d11846 (diff) | |
| download | anaconda-441ccff98ec88d3ecfc9c6926ff2e0d17801678f.tar.gz anaconda-441ccff98ec88d3ecfc9c6926ff2e0d17801678f.tar.xz anaconda-441ccff98ec88d3ecfc9c6926ff2e0d17801678f.zip | |
Use only real parted fstype names when checking parted results.
Set fstype of efi system partition to efi, not vfat.
Diffstat (limited to 'autopart.py')
| -rw-r--r-- | autopart.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/autopart.py b/autopart.py index 9b021317d..8d7a73c53 100644 --- a/autopart.py +++ b/autopart.py @@ -78,7 +78,7 @@ def bootRequestCheck(req, diskset): if not part.fs_type.name.startswith("ext"): return BOOT_NOT_EXT2 elif req.mountpoint == "/boot/efi": - if not part.fs_type.name in ("FAT", "fat16", "fat32"): + if not part.fs_type.name in ["fat16", "fat32"]: return BOOTEFI_NOT_VFAT elif rhpl.getArch() == "alpha": return bootAlphaCheckRequirements(part) @@ -873,6 +873,9 @@ def setPreexistParts(diskset, requests): part = disk.next_partition() while part: if part.geom.start == request.start and part.geom.end == request.end: + if partedUtils.isEfiSystemPartition(part) and \ + request.fstype.name == "vfat": + request.fstype = fsset.fileSystemTypeGet("efi") # if the partition is being resized, we do that now if request.targetSize is not None: startSec = part.geom.start @@ -1161,7 +1164,8 @@ def doClearPartAction(anaconda, partitions, diskset): part.geom.end) partitions.addDelete(delete) - # EFI autopartitioning is strange as /boot/efi is vfat -- + # EFI autopartitioning is strange as /boot/efi is efi (which is + # really vfat) -- # if linuxonly and have an msdos partition and it has the # bootable flag set, do not delete it and make it our # /boot/efi as it could contain system utils. @@ -1171,6 +1175,7 @@ def doClearPartAction(anaconda, partitions, diskset): req = partitions.getRequestByDeviceName(partedUtils.get_partition_name(part)) req.mountpoint = "/boot/efi" req.format = 0 + req.fstype = fsset.fileSystemTypeGet("efi") request = None for req in partitions.autoPartitionRequests: |