diff options
| author | Mike Fulbright <msf@redhat.com> | 2000-06-21 16:01:14 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2000-06-21 16:01:14 +0000 |
| commit | 6bf41525b2355ce0de50b74f1d111c67e9033220 (patch) | |
| tree | ffcdeda5dc4df4ff1b7774c70479818fd75e577d | |
| parent | 72cadb7337f05c35cc19d8a16caa9a02b11055a2 (diff) | |
| download | anaconda-6bf41525b2355ce0de50b74f1d111c67e9033220.tar.gz anaconda-6bf41525b2355ce0de50b74f1d111c67e9033220.tar.xz anaconda-6bf41525b2355ce0de50b74f1d111c67e9033220.zip | |
HJ patch.8 to make upgrades ignore bad partition tables
| -rw-r--r-- | fstab.py | 18 | ||||
| -rw-r--r-- | iw/installpath_gui.py | 3 | ||||
| -rw-r--r-- | text.py | 6 |
3 files changed, 16 insertions, 11 deletions
@@ -191,7 +191,8 @@ class Fstab: fstab.append ((dev, mntpoint)) self.ddruid = self.fsedit(0, self.driveList(), fstab, self.zeroMbr, - self.readOnly, 0, self.expert) + self.readOnly, 0, + (self.expert or self.upgrade)) del self.cachedFstab def closeDrives(self, clearFstabCache = 0): @@ -836,7 +837,8 @@ class Fstab: list = tlist return self.fsedit(0, list, fstab, self.zeroMbr, - self.readOnly, ignoreBadDrives, self.expert) + self.readOnly, ignoreBadDrives, + (self.expert or self.upgrade)) def getRunDruid(self): return self.shouldRunDruid @@ -846,7 +848,7 @@ class Fstab: def __init__(self, fsedit, fserror, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow, progressWindow, - ignoreRemovable, protected, expert): + ignoreRemovable, protected, expert, upgrade): self.fsedit = fsedit self.fserror = fserror @@ -866,6 +868,7 @@ class Fstab: self.badBlockCheck = 0 self.ignoreRemovable = ignoreRemovable self.expert = expert + self.upgrade = upgrade # # extraFilesystems used for upgrades when /etc/fstab is read as @@ -905,14 +908,15 @@ class GuiFstab(Fstab): def __init__(self, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow, progressWindow, ignoreRemovable, - protected, expert): + protected, expert, upgrade): from gnomepyfsedit import fsedit from gnomepyfsedit import fserror from gtk import * Fstab.__init__(self, fsedit, fserror, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow, - progressWindow, ignoreRemovable, protected, expert) + progressWindow, ignoreRemovable, protected, + expert, upgrade) self.GtkFrame = GtkFrame self.GtkAccelGroup = GtkAccelGroup @@ -923,14 +927,14 @@ class NewtFstab(Fstab): def __init__(self, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow, progressWindow, - ignoreRemovable, protected, expert): + ignoreRemovable, protected, expert, upgrade): from newtpyfsedit import fsedit from newtpyfsedit import fserror Fstab.__init__(self, fsedit, fserror, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow, progressWindow, - ignoreRemovable, protected, expert) + ignoreRemovable, protected, expert, upgrade) def readFstab (path, fstab): loopIndex = {} diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py index 8128e0c92..10faa78c7 100644 --- a/iw/installpath_gui.py +++ b/iw/installpath_gui.py @@ -130,7 +130,8 @@ class InstallPathWindow (InstallWindow): self.todo.intf.progressWindow, not self.todo.expert, self.todo.method.protectedPartitions(), - self.todo.expert) + self.todo.expert, + self.todo.upgrade) ### ### msf - 05-11-2000 - need to move this code!!!!!! @@ -148,7 +148,7 @@ class InstallPathWindow: todo.intf.progressWindow, not todo.expert, todo.method.protectedPartitions(), - todo.expert) + todo.expert, todo.upgrade) return INSTALL_NOOP classes = installclass.availableClasses() @@ -206,7 +206,7 @@ class InstallPathWindow: todo.intf.progressWindow, not todo.expert, todo.method.protectedPartitions(), - todo.expert) + todo.expert, todo.upgrade) return INSTALL_OK @@ -224,7 +224,7 @@ class UpgradeExamineWindow: todo.intf.progressWindow, not todo.expert, todo.method.protectedPartitions(), - todo.expert) + todo.expert, 1) return INSTALL_NOOP |