diff options
| -rw-r--r-- | iw/partition_gui.py | 9 | ||||
| -rw-r--r-- | textw/partition_text.py | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/iw/partition_gui.py b/iw/partition_gui.py index d83b7e2e7..26a51014d 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -396,7 +396,8 @@ def createRaidLevelMenu(levels, reqlevel, raidlevelchangeCB, sparesb): return (leveloption, leveloptionmenu) # pass in callback for when fs changes because of python scope issues -def createFSTypeMenu(fstype, fstypechangeCB, mountCombo, availablefstypes=None): +def createFSTypeMenu(fstype, fstypechangeCB, mountCombo, + availablefstypes = None, ignorefs = None): fstypeoption = GtkOptionMenu () fstypeoptionMenu = GtkMenu () types = fileSystemTypeGetTypes() @@ -415,6 +416,9 @@ def createFSTypeMenu(fstype, fstypechangeCB, mountCombo, availablefstypes=None): for name in names: if not fileSystemTypeGet(name).isSupported(): continue + + if ignorefs and name in ignorefs: + continue if fileSystemTypeGet(name).isFormattable(): item = GtkMenuItem(name) @@ -1295,7 +1299,8 @@ class PartitionWindow(InstallWindow): (fstypeoption, fstypeoptionMenu) = createFSTypeMenu(raidrequest.fstype, fstypechangeCB, - mountCombo) + mountCombo, + ignorefs = ["software RAID"]) maintable.attach(fstypeoption, 1, 2, row, row + 1) row = row + 1 diff --git a/textw/partition_text.py b/textw/partition_text.py index b9d73d972..0a34a2857 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -66,6 +66,8 @@ class PartitionWindow: elif part.fs_type: if request and request.fstype != None: ptype = request.fstype.getName() + if ptype == "foreign": + ptype = map_foreign_to_fsname(part.native_type) else: ptype = part.fs_type.name else: @@ -201,7 +203,8 @@ class PartitionWindow: # make the list of available filesystems and it's label - def makeFsList(self, request, usecallback=1, uselabel=1, usetypes=None): + def makeFsList(self, request, usecallback=1, uselabel=1, usetypes=None, + ignorefs = None): subgrid = Grid(1, 2) row = 0 # filesystem type selection @@ -221,6 +224,9 @@ class PartitionWindow: if not fileSystemTypeGet(name).isSupported(): continue + if ignorefs and name in ignorefs: + continue + if fileSystemTypeGet(name).isFormattable(): fstype.append(name, types[name]) if request.fstype and request.fstype.getName() in names and \ @@ -778,7 +784,7 @@ class PartitionWindow: row = row + 1 subgrid = Grid(2, 1) - (fstype, fsgrid) = self.makeFsList(raidrequest) + (fstype, fsgrid) = self.makeFsList(raidrequest, ignorefs = ["software RAID"]) subgrid.setField(fsgrid, 0, 0, anchorLeft = 1, anchorTop=1) (raidtype, raidgrid) = self.makeRaidList(raidrequest) subgrid.setField(raidgrid, 1, 0, (2,0,0,0), anchorRight=1, anchorTop=1) |