diff options
| author | David Lehman <dlehman@redhat.com> | 2008-03-27 15:52:52 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2008-03-28 11:14:39 -0500 |
| commit | d504f0b11ac13ddd9dc4e60ca02b24d086b1cf4d (patch) | |
| tree | 1f76ba56df34d2f35e52e727f161bb4c01f6c467 | |
| parent | 150affc4edbd0d1fedabd2dd77f408854aecc530 (diff) | |
| download | anaconda-d504f0b11ac13ddd9dc4e60ca02b24d086b1cf4d.tar.gz anaconda-d504f0b11ac13ddd9dc4e60ca02b24d086b1cf4d.tar.xz anaconda-d504f0b11ac13ddd9dc4e60ca02b24d086b1cf4d.zip | |
Handle fstype munging in isys.readFSType instead of in various other places.
| -rwxr-xr-x | isys/isys.py | 2 | ||||
| -rw-r--r-- | partitions.py | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/isys/isys.py b/isys/isys.py index 8c20d1e76..5cb63030f 100755 --- a/isys/isys.py +++ b/isys/isys.py @@ -790,6 +790,8 @@ def readFSType(device): return "physical volume (LVM)" if fstype == "ext4": return "ext4dev" + elif fstype == "lvm2pv": + return "physical volume (LVM)" return fstype def ext2Clobber(device): diff --git a/partitions.py b/partitions.py index 8542c2f71..399fd8cc5 100644 --- a/partitions.py +++ b/partitions.py @@ -335,13 +335,10 @@ class Partitions: if luksDev and not luksDev.openDevice(): mappedDev = luksDev.getDevice() fsname = partedUtils.sniffFilesystemType("/dev/%s" % mappedDev) - if fsname == "lvm2pv": - ptype = fsset.fileSystemTypeGet("physical volume (LVM)") - else: - try: - ptype = fsset.fileSystemTypeGet(fsname) - except: - ptype = fsset.fileSystemTypeGet("foreign") + try: + ptype = fsset.fileSystemTypeGet(fsname) + except: + ptype = fsset.fileSystemTypeGet("foreign") start = part.geom.start end = part.geom.end |