summaryrefslogtreecommitdiffstats
path: root/partedUtils.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-11-09 00:09:23 +0000
committerJeremy Katz <katzj@redhat.com>2003-11-09 00:09:23 +0000
commit051af548f6989519fb4eb2a363805dd931feb836 (patch)
tree7c30b08ff35c407fd1306fe07fc0d34218473d5c /partedUtils.py
parent8c7d35b6a2f28e049de3d6a88f23f66526b7ae7b (diff)
downloadanaconda-051af548f6989519fb4eb2a363805dd931feb836.tar.gz
anaconda-051af548f6989519fb4eb2a363805dd931feb836.tar.xz
anaconda-051af548f6989519fb4eb2a363805dd931feb836.zip
some more xfs/jfs bits based off of patch from
Ajay Ramaswamy <xfs@ramaswamy.net>. this adds support for xfs labels and for sniffing jfs in a couple of places
Diffstat (limited to 'partedUtils.py')
-rw-r--r--partedUtils.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/partedUtils.py b/partedUtils.py
index 8fc03b173..5fdb300a5 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -421,7 +421,10 @@ def sniffFilesystemType(device):
if fsset.isValidReiserFS(dev):
return "reiserfs"
- # FIXME: we don't look for jfs, or vfat
+ if fsset.isValidJFS(dev):
+ return "jfs"
+
+ # FIXME: we don't look for vfat
return None
@@ -529,17 +532,17 @@ class DiskSet:
not (part.get_flag(parted.PARTITION_RAID)
or part.get_flag(parted.PARTITION_LVM))
and part.fs_type
- and (part.fs_type.name == "ext2"
- or part.fs_type.name == "ext3"))
+ and (part.fs_type.name in ("ext2",
+ "ext3", "xfs")))
parts = filter_partitions(disk, func)
for part in parts:
node = get_partition_name(part)
- label = isys.readExt2Label(node)
+ label = isys.readFSLabel(node)
if label:
labels[node] = label
for dev, devices, level, numActive in DiskSet.mdList:
- label = isys.readExt2Label(dev)
+ label = isys.readFSLabel(dev)
if label:
labels[dev] = label