diff options
| author | David Lehman <dlehman@redhat.com> | 2009-03-09 19:47:34 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-03-09 20:13:56 -0500 |
| commit | 65542dd664c9a2d7d2c6af66dc6ecda2ea1544b3 (patch) | |
| tree | 7482978554dea375cb76dc388223c3348c0092bb | |
| parent | 7db25498c16f455316d6065212542e820c39f972 (diff) | |
| download | anaconda-65542dd664c9a2d7d2c6af66dc6ecda2ea1544b3.tar.gz anaconda-65542dd664c9a2d7d2c6af66dc6ecda2ea1544b3.tar.xz anaconda-65542dd664c9a2d7d2c6af66dc6ecda2ea1544b3.zip | |
Move the recursive teardown of all devices out of processActions.
For upgrades we won't want to tear down everything, so do it in
turnOnFilesystems instead, since we're already doing several
things in there based on upgrade -v- install.
| -rw-r--r-- | packages.py | 1 | ||||
| -rw-r--r-- | storage/devicetree.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/packages.py b/packages.py index 2dd562d6a..26eb7dfa0 100644 --- a/packages.py +++ b/packages.py @@ -103,6 +103,7 @@ def turnOnFilesystems(anaconda): iutil.execWithRedirect("swapoff", ["-a"], stdout = "/dev/tty5", stderr="/dev/tty5", searchPath = 1) + anaconda.id.storage.devicetree.teardownAll() upgrade_migrate = False if anaconda.id.upgrade: diff --git a/storage/devicetree.py b/storage/devicetree.py index 7bd9ecc1d..4729810d0 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -473,7 +473,6 @@ class DeviceTree(object): for action in self._actions: log.debug("action: %s" % action) - self.teardownAll() for action in self._actions: log.info("executing action: %s" % action) if not dryRun: |