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

[PATCH 1/3] Fix DeviceTree cleanup w/ inactive luks devs in cmdline mode.



---
 pyanaconda/storage/devicetree.py |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py
index 214f577..a3ddde2 100644
--- a/pyanaconda/storage/devicetree.py
+++ b/pyanaconda/storage/devicetree.py
@@ -1074,22 +1074,18 @@ class DeviceTree(object):
             passphrase = self.__luksDevs.get(device.format.uuid)
             if passphrase:
                 device.format.passphrase = passphrase
+            elif self._cleanup:
+                # if we're only building the devicetree so that we can
+                # tear down all of the devices we don't need a passphrase
+                if device.format.status and self._cleanup:
+                    # this makes device.configured return True
+                    device.format.passphrase = 'yabbadabbadoo'
             else:
-                try:
-                    (passphrase, isglobal) = getLUKSPassphrase(self.intf,
-                                                    device,
-                                                    self.__passphrase)
-                except RuntimeError as e:
-                    # if we're only building the devicetree so that we can
-                    # tear down all of the devices we don't need a passphrase
-                    if device.format.status and self._cleanup:
-                        # this makes device.configured return True
-                        device.format.passphrase = 'yabbadabbadoo'
-                    else:
-                        raise
-                else:
-                    if isglobal and device.format.status:
-                        self.__passphrase = passphrase
+                (passphrase, isglobal) = getLUKSPassphrase(self.intf,
+                                                device,
+                                                self.__passphrase)
+                if isglobal and device.format.status:
+                    self.__passphrase = passphrase
 
             luks_device = LUKSDevice(device.format.mapName,
                                      parents=[device],
-- 
1.7.3.2


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