Fix handling of swap files. (#496529)

We have to try as late as possible to identify the device that contains
the swap file to maximize the chances that the filesystem will be
mounted when we go to look for it.

1 files changed, 11 insertions, 0 deletions

diff --git a/storage/__init__.py b/storage/__init__.py
index a3fbb5dd6..de3f202d1 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -1483,6 +1483,17 @@ class FSSet(object):
 
     def turnOnSwap(self, anaconda, upgrading=None):
         for device in self.swapDevices:
+            if isinstance(device, FileDevice):
+                # set up FileDevices' parents now that they are accessible
+                targetDir = "%s/%s" % (anaconda.rootPath, device.path)
+                parent = get_containing_device(targetDir, self.devicetree)
+                if not parent:
+                    log.error("cannot determine which device contains "
+                              "directory %s" % device.path)
+                    device.parents = []
+                else:
+                    device.parents = [parent]
+
             try:
                 device.setup()
                 device.format.setup()