diff options
| -rw-r--r-- | fstab.py | 19 | ||||
| -rw-r--r-- | iw/installpath_gui.py | 3 | ||||
| -rw-r--r-- | text.py | 9 |
3 files changed, 19 insertions, 12 deletions
@@ -171,7 +171,7 @@ class Fstab: fstab.append ((dev, mntpoint)) self.ddruid = self.fsedit(0, self.driveList(), fstab, self.zeroMbr, - self.readOnly) + self.readOnly, 0, self.expert) del self.cachedFstab def closeDrives(self, clearFstabCache = 0): @@ -768,7 +768,7 @@ class Fstab: list = tlist return self.fsedit(0, list, fstab, self.zeroMbr, - self.readOnly, ignoreBadDrives) + self.readOnly, ignoreBadDrives, self.expert) def getRunDruid(self): return self.shouldRunDruid @@ -778,7 +778,7 @@ class Fstab: def __init__(self, fsedit, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow, progressWindow, - ignoreRemovable, protected): + ignoreRemovable, protected, expert): self.fsedit = fsedit self.fsCache = {} @@ -796,6 +796,7 @@ class Fstab: self.progressWindow = progressWindow self.badBlockCheck = 0 self.ignoreRemovable = ignoreRemovable + self.expert = expert # # extraFilesystems used for upgrades when /etc/fstab is read as @@ -834,13 +835,14 @@ class GuiFstab(Fstab): self.beenSaved = 0 def __init__(self, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, - messageWindow, progressWindow, ignoreRemovable, protected): + messageWindow, progressWindow, ignoreRemovable, + protected, expert): from gnomepyfsedit import fsedit from gtk import * Fstab.__init__(self, fsedit, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow, - progressWindow, ignoreRemovable, protected) + progressWindow, ignoreRemovable, protected, expert) self.GtkFrame = GtkFrame self.GtkAccelGroup = GtkAccelGroup @@ -849,13 +851,14 @@ class GuiFstab(Fstab): class NewtFstab(Fstab): - def __init__(self, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, - messageWindow, progressWindow, ignoreRemovable, protected): + def __init__(self, setupFilesystems, serial, zeroMbr, readOnly, + waitWindow, messageWindow, progressWindow, + ignoreRemovable, protected, expert): from newtpyfsedit import fsedit Fstab.__init__(self, fsedit, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow, progressWindow, - ignoreRemovable, protected) + ignoreRemovable, protected, expert) def readFstab (path, fstab): loopIndex = {} diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py index 4e8e6d143..8128e0c92 100644 --- a/iw/installpath_gui.py +++ b/iw/installpath_gui.py @@ -129,7 +129,8 @@ class InstallPathWindow (InstallWindow): self.todo.intf.messageWindow, self.todo.intf.progressWindow, not self.todo.expert, - self.todo.method.protectedPartitions()) + self.todo.method.protectedPartitions(), + self.todo.expert) ### ### msf - 05-11-2000 - need to move this code!!!!!! @@ -230,7 +230,8 @@ class InstallPathWindow: todo.intf.messageWindow, todo.intf.progressWindow, not todo.expert, - todo.method.protectedPartitions()) + todo.method.protectedPartitions(), + todo.expert) return INSTALL_NOOP classes = installclass.availableClasses() @@ -287,7 +288,8 @@ class InstallPathWindow: todo.intf.messageWindow, todo.intf.progressWindow, not todo.expert, - todo.method.protectedPartitions()) + todo.method.protectedPartitions(), + todo.expert) return INSTALL_OK @@ -304,7 +306,8 @@ class UpgradeExamineWindow: todo.intf.messageWindow, todo.intf.progressWindow, not todo.expert, - todo.method.protectedPartitions()) + todo.method.protectedPartitions(), + todo.expert) return INSTALL_NOOP |