diff options
author | David Lehman <dlehman@redhat.com> | 2012-08-17 16:30:42 -0500 |
---|---|---|
committer | David Lehman <dlehman@redhat.com> | 2012-08-20 13:19:15 -0500 |
commit | 2ae43f68b40f19435bb7076bc10ea72b9b0b8d40 (patch) | |
tree | 063aedcb9b4f607950b165bfd9d016133a2f29ac /pyanaconda | |
parent | 40950fa1653d3dede7043107d90341a592ac0097 (diff) | |
download | anaconda-2ae43f68b40f19435bb7076bc10ea72b9b0b8d40.tar.gz anaconda-2ae43f68b40f19435bb7076bc10ea72b9b0b8d40.tar.xz anaconda-2ae43f68b40f19435bb7076bc10ea72b9b0b8d40.zip |
Show fstype as "Unknown" for devices with unrecognised formatting.
Much like the btrfs hacks, we add "Unknown" onto the end of the list
only when the current device is unformatted and do not include it in
the list for other devices.
Diffstat (limited to 'pyanaconda')
-rw-r--r-- | pyanaconda/ui/gui/spokes/custom.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 801295aa9..6f5fdcc42 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -697,6 +697,16 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): elif btrfs_included and not include_btrfs: typeCombo.remove(len(typeCombo.get_model()) - 1) + # if the format is unknown/none, add that to the list + # otherwise, make sure it's not in the list + unknown_fmt = getFormat(None) + include_unknown = device.format.type is None + unknown_included = fsCombo.get_model()[-1][0] == unknown_fmt.name + if include_unknown and not unknown_included: + fsCombo.append_text(unknown_fmt.name) + elif unknown_included and not include_unknown: + fsCombo.remove(len(fsCombo.get_model()) - 1) + # FIXME: What do we do if we can't figure it out? if device.type == "lvmlv": typeCombo.set_active(DEVICE_TYPE_LVM) |