summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-09-25 22:15:34 +0000
committerJeremy Katz <katzj@redhat.com>2003-09-25 22:15:34 +0000
commit10b0c3b8d2c0c8f50859a402a6699d4a24f21158 (patch)
tree97bbd813669ead0ebbb4ccaa20d3f69d00116216
parent9c8ce90053dcfba57762413da4a310bcc5751de5 (diff)
downloadanaconda-10b0c3b8d2c0c8f50859a402a6699d4a24f21158.tar.gz
anaconda-10b0c3b8d2c0c8f50859a402a6699d4a24f21158.tar.xz
anaconda-10b0c3b8d2c0c8f50859a402a6699d4a24f21158.zip
restrict fs to software RAID when going from the wizard (#67563)
-rw-r--r--iw/partition_dialog_gui.py6
-rw-r--r--iw/partition_gui.py7
2 files changed, 8 insertions, 5 deletions
diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
index 3edd3548d..17b372a15 100644
--- a/iw/partition_dialog_gui.py
+++ b/iw/partition_dialog_gui.py
@@ -247,7 +247,8 @@ class PartitionEditor:
self.dialog = None
- def __init__(self, partitions, diskset, intf, parent, origrequest, isNew = 0):
+ def __init__(self, partitions, diskset, intf, parent, origrequest,
+ isNew = 0, restrictfs = None):
self.partitions = partitions
self.diskset = diskset
self.origrequest = origrequest
@@ -293,7 +294,8 @@ class PartitionEditor:
(self.newfstype, self.newfstypeMenu) = createFSTypeMenu(self.origrequest.fstype,
fstypechangeCB,
- self.mountCombo)
+ self.mountCombo,
+ availablefstypes = restrictfs)
lbl.set_mnemonic_widget(self.newfstype)
maintable.attach(self.newfstype, 1, 2, row, row + 1)
else:
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 7324944e6..1dfd4b5f1 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -1082,13 +1082,14 @@ class PartitionWindow(InstallWindow):
raideditor.destroy()
- def editPartitionRequest(self, origrequest, isNew = 0):
+ def editPartitionRequest(self, origrequest, isNew = 0, restrictfs = None):
parteditor = partition_dialog_gui.PartitionEditor(self.partitions,
self.diskset,
self.intf,
self.parent,
origrequest,
- isNew)
+ isNew = isNew,
+ restrictfs = restrictfs)
while 1:
request = parteditor.run()
@@ -1297,7 +1298,7 @@ class PartitionWindow(InstallWindow):
# see which option they choose
if createRAIDpart.get_active():
rdrequest = NewPartitionSpec(fileSystemTypeGet("software RAID"), size = 100)
- rc = self.editPartitionRequest(rdrequest, isNew = 1)
+ rc = self.editPartitionRequest(rdrequest, isNew = 1, restrictfs=["software RAID"])
elif createRAIDdev.get_active():
self.editRaidRequest(request, isNew=1)
else: