summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--iw/lvm_dialog_gui.py4
-rw-r--r--iw/partition_ui_helpers_gui.py2
-rw-r--r--iw/raid_dialog_gui.py2
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