diff options
| author | David Lehman <dlehman@redhat.com> | 2009-04-09 00:18:43 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-04-09 15:53:01 -0500 |
| commit | 4efd040c457287f8d6a36fa32542a3c46b5f46d7 (patch) | |
| tree | 68fda14f5c930c88ae31ba44bce89fd8a65eae04 /iw | |
| parent | 6cc86bb35089eae1daa73fd2f9ee0e3de4ae881b (diff) | |
| download | anaconda-4efd040c457287f8d6a36fa32542a3c46b5f46d7.tar.gz anaconda-4efd040c457287f8d6a36fa32542a3c46b5f46d7.tar.xz anaconda-4efd040c457287f8d6a36fa32542a3c46b5f46d7.zip | |
Fix display of format type for devices.anaconda-11.5.0.42-1
When re-editing a new device, the fstype combo was not getting set to
the current format type because of confusion caused by the use of
format name in some places and format type in others.
The only thing we use the name attribute for is displaying in the
fstype combo. For everything else we use the type attribute.
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/lvm_dialog_gui.py | 4 | ||||
| -rw-r--r-- | iw/partition_ui_helpers_gui.py | 2 | ||||
| -rw-r--r-- | iw/raid_dialog_gui.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index 8f14003d3..5c075e9a2 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -417,7 +417,7 @@ class VolumeGroupEditor: newfstypeCombo = createFSTypeMenu(format, fstypechangeCB, mountCombo, - ignorefs = ["software RAID", "physical volume (LVM)", "efi", "PPC PReP Boot", "Apple Bootstrap"]) + ignorefs = ["mdmember", "lvmpv", "efi", "prepboot", "appleboot"]) lbl.set_mnemonic_widget(newfstypeCombo) maintable.attach(newfstypeCombo, 1, 2, row, row + 1) row += 1 @@ -488,7 +488,7 @@ class VolumeGroupEditor: templuks = None break - (row, self.fsoptionsDict) = createPreExistFSOptionSection(reallv, maintable, row, mountCombo, self.storage, ignorefs = ["software RAID", "physical volume (LVM)", "vfat"], luksdev=templuks) + (row, self.fsoptionsDict) = createPreExistFSOptionSection(reallv, maintable, row, mountCombo, self.storage, ignorefs = ["mdmember", "lvmpv", "vfat"], luksdev=templuks) # checkbutton for encryption using dm-crypt/LUKS if not lv['exists']: diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py index ff13d7012..0b45e5fc1 100644 --- a/iw/partition_ui_helpers_gui.py +++ b/iw/partition_ui_helpers_gui.py @@ -187,7 +187,7 @@ def createFSTypeMenu(format, fstypechangeCB, mountCombo, else: names = device_formats.keys() if format and format.supported and format.formattable: - default = format.name + default = format.type else: default = get_default_filesystem_type() diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index 177c4c366..095c3f800 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -375,7 +375,7 @@ class RaidEditor: self.fstypeCombo = createFSTypeMenu(format, fstypechangeCB, self.mountCombo, - ignorefs = ["software RAID", "efi", "PPC PReP Boot", "Apple Bootstrap"]) + ignorefs = ["mdmember", "efi", "prepboot", "appleboot"]) lbl.set_mnemonic_widget(self.fstypeCombo) maintable.attach(self.fstypeCombo, 1, 2, row, row + 1) row += 1 |