diff options
| author | David Lehman <dlehman@redhat.com> | 2009-04-24 13:55:10 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-04-24 15:00:37 -0500 |
| commit | b411847a898d4040bfd96e0e78ad289dc08c1b70 (patch) | |
| tree | 5ac7b60002e7a375b7f357f18dec9b4f12a49dc9 | |
| parent | 83ad0ffd5086571378812ed173f0ee483df28f48 (diff) | |
| download | anaconda-b411847a898d4040bfd96e0e78ad289dc08c1b70.tar.gz anaconda-b411847a898d4040bfd96e0e78ad289dc08c1b70.tar.xz anaconda-b411847a898d4040bfd96e0e78ad289dc08c1b70.zip | |
Pass anaconda to turnOnSwap so we can use swap files.
For swap files we need to know anaconda.rootPath and since we're also
using anaconda.intf it seems like time to just give in and pass anaconda.
| -rw-r--r-- | packages.py | 2 | ||||
| -rw-r--r-- | rescue.py | 2 | ||||
| -rw-r--r-- | storage/__init__.py | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/packages.py b/packages.py index a7f5e3212..275c7c764 100644 --- a/packages.py +++ b/packages.py @@ -193,7 +193,7 @@ def turnOnFilesystems(anaconda): sys.exit(1) if not anaconda.id.upgrade: - anaconda.id.storage.fsset.turnOnSwap(anaconda.intf) + anaconda.id.storage.fsset.turnOnSwap(anaconda) anaconda.id.storage.fsset.mountFilesystems(anaconda, raiseErrors=False, readOnly=False, @@ -327,7 +327,7 @@ def runRescue(anaconda, instClass): # now turn on swap if not readOnly: try: - anaconda.id.storage.fsset.turnOnSwap(anaconda.intf) + anaconda.id.storage.fsset.turnOnSwap(anaconda) except: log.error("Error enabling swap") diff --git a/storage/__init__.py b/storage/__init__.py index 8ad919547..a3fbb5dd6 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -1481,13 +1481,13 @@ class FSSet(object): options) return mtab - def turnOnSwap(self, intf=None, upgrading=None): + def turnOnSwap(self, anaconda, upgrading=None): for device in self.swapDevices: try: device.setup() device.format.setup() except SuspendError: - if intf: + if anaconda.intf: if upgrading: msg = _("The swap device:\n\n %s\n\n" "in your /etc/fstab file is currently in " @@ -1506,10 +1506,10 @@ class FSSet(object): "to format all swap devices.") \ % device.path - intf.messageWindow(_("Error"), msg) + anaconda.intf.messageWindow(_("Error"), msg) sys.exit(0) except DeviceError as (msg, path): - if intf: + if anaconda.intf: if upgrading: err = _("Error enabling swap device %s: %s\n\n" "The /etc/fstab on your upgrade partition " @@ -1522,7 +1522,7 @@ class FSSet(object): "device has not been initialized.\n\n" "Press OK to exit the installer.") % \ (path, msg) - intf.messageWindow(_("Error"), err) + anaconda.intf.messageWindow(_("Error"), err) sys.exit(0) def mountFilesystems(self, anaconda, raiseErrors=None, readOnly=None, |