Merge pull request #5858 from vojtechtrefny/master_turn-on-swap-ignor…

…e-all Ignore all storage errors when trying to activate swaps
rhinstaller · Sep 1, 2024 · 5fc607c · 5fc607c
2 parents 2eb91b8 + 5c39951
commit 5fc607c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pyanaconda/modules/storage/devicetree/fsset.py b/pyanaconda/modules/storage/devicetree/fsset.py
@@ -22,7 +22,8 @@
 from blivet import blockdev
 from blivet.devices import NoDevice, DirectoryDevice, NFSDevice, FileDevice, MDRaidArrayDevice, \
     NetworkStorageDevice, OpticalDevice
-from blivet.errors import UnrecognizedFSTabEntryError, FSTabTypeMismatchError, SwapSpaceError
+from blivet.errors import UnrecognizedFSTabEntryError, FSTabTypeMismatchError, SwapSpaceError, \
+    StorageError
 from blivet.formats import get_format, get_device_format_class
 from blivet.storage_log import log_exception_info
 
@@ -528,7 +529,8 @@ def turn_on_swap(self, root_path=""):
                 try:
                     device.setup()
                     device.format.setup()
-                except (SwapSpaceError, blockdev.SwapActivateError) as e:
+                except (SwapSpaceError, blockdev.SwapActivateError,
+                        StorageError, blockdev.BlockDevError) as e:
                     log.error("Failed to activate swap on '%s': %s", device.name, str(e))
                     break
                 else: