[PATCH] Move the recursive teardown of all devices out of processActions.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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.
---
 packages.py           |    1 +
 storage/devicetree.py |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages.py b/packages.py
index 2dd562d..26eb7df 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 7bd9ecc..4729810 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:
-- 
1.6.0.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux