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.
---
iw/lvm_dialog_gui.py | 4 ++--
iw/partition_ui_helpers_gui.py | 2 +-
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 8f14003..5c075e9 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 2722d7d..3886aee 100644
--- a/iw/partition_ui_helpers_gui.py
+++ b/iw/partition_ui_helpers_gui.py
@@ -188,7 +188,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 177c4c3..095c3f8 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
--
1.6.0.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
