diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-05-05 15:06:15 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-05-05 15:06:15 +0000 |
| commit | b9e34905bc504195c881201ba7b472d65577d735 (patch) | |
| tree | 43017cf1607c5a8c9398647092874b62c64aca3b /partitions.py | |
| parent | a2ecfaa6df7a71b5b36cb8b1898065b9ef11220a (diff) | |
| download | anaconda-b9e34905bc504195c881201ba7b472d65577d735.tar.gz anaconda-b9e34905bc504195c881201ba7b472d65577d735.tar.xz anaconda-b9e34905bc504195c881201ba7b472d65577d735.zip | |
merge changes from taroon-branch. this merges up to anaconda-9.0.2-1.RHEL
Diffstat (limited to 'partitions.py')
| -rw-r--r-- | partitions.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/partitions.py b/partitions.py index 4a4bb0955..7780145a8 100644 --- a/partitions.py +++ b/partitions.py @@ -104,13 +104,11 @@ class Partitions: ptype = fsset.fileSystemTypeGet("software RAID") elif part.get_flag(parted.PARTITION_LVM) == 1: ptype = fsset.fileSystemTypeGet("physical volume (LVM)") - elif part.fs_type: + else: ptype = partedUtils.get_partition_file_system_type(part) - if part.fs_type.name == "linux-swap": + if part.fs_type and part.fs_type.name == "linux-swap": # XXX this is a hack format = 1 - else: - ptype = fsset.fileSystemTypeGet("foreign") start = part.geom.start end = part.geom.end |