diff options
| author | Matt Wilson <msw@redhat.com> | 2002-11-22 02:34:47 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2002-11-22 02:34:47 +0000 |
| commit | c07c326a0d8681749ac0293e604f1a27dac2f54c (patch) | |
| tree | 16161a910977a0862b9e6742b7f08c603ca141b1 | |
| parent | ee5a050f25368580d25e12c7a17cb86740c72cf7 (diff) | |
| download | anaconda-c07c326a0d8681749ac0293e604f1a27dac2f54c.tar.gz anaconda-c07c326a0d8681749ac0293e604f1a27dac2f54c.tar.xz anaconda-c07c326a0d8681749ac0293e604f1a27dac2f54c.zip | |
more parted 1.6.x changes - this should probably be moved to partedUtils.fsTypeIsFAT() or something
| -rw-r--r-- | autopart.py | 7 | ||||
| -rw-r--r-- | partedUtils.py | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/autopart.py b/autopart.py index 55ba18dbd..a0a2b366a 100644 --- a/autopart.py +++ b/autopart.py @@ -50,7 +50,8 @@ def bootRequestCheck(requests, diskset): if iutil.getArch() == "ia64": - if part.fs_type.name != "FAT": + if (part.fs_type.name != "FAT" and part.fs_type.name != "fat16" + and part.fs_type.name != "fat32"): return BOOTEFI_NOT_VFAT pass elif iutil.getArch() == "i386": @@ -1056,7 +1057,9 @@ def doClearPartAction(partitions, diskset): if ((iutil.getArch() == "ia64") and (linuxOnly == 1) and (not partitions.isKickstart) and part.is_flag_available(parted.PARTITION_BOOT)): - if part.fs_type and part.fs_type.name == "FAT": + if part.fs_type and (part.fs_type.name == "FAT" + or part.fs_type.name == "fat16" + or part.fs_type.name == "fat32"): if part.get_flag(parted.PARTITION_BOOT): req = partitions.getRequestByDeviceName(partedUtils.get_partition_name(part)) req.mountpoint = "/boot/efi" diff --git a/partedUtils.py b/partedUtils.py index c834c8b53..6d09c24a4 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -133,7 +133,8 @@ def get_partition_file_system_type(part): return None if part.fs_type.name == "linux-swap": ptype = fsset.fileSystemTypeGet("swap") - elif part.fs_type.name == "FAT": + elif (part.fs_type.name == "FAT" or part.fs_type.name == "fat16" + or part.fs_type.name == "fat32"): ptype = fsset.fileSystemTypeGet("vfat") else: try: |