From 5c87452b67ba7bfd83912e5738929e9f57ca805b Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sat, 24 Sep 2022 13:46:44 +0200 Subject: [PATCH] fix initcpiocfg filesystems loop Signed-off-by: Peter Jung --- src/modules/initcpiocfg/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index 96258f632..fb557a479 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -169,8 +169,6 @@ def find_initcpio_features(partitions, root_mount_point): hooks.append("plymouth") for partition in partitions: - hooks.extend(["filesystems"]) - if partition["fs"] == "linuxswap" and not partition.get("claimed", None): # Skip foreign swap continue @@ -218,9 +216,11 @@ def find_initcpio_features(partitions, root_mount_point): hooks.append("zfs") if swap_uuid != "": - hooks.extend(["resume"]) if encrypt_hook and openswap_hook: hooks.extend(["openswap"]) + hooks.extend(["resume", "filesystems"]) + else: + hooks.extend(["filesystems"]) if uses_btrfs: modules.append("crc32c-intel" if cpuinfo().is_intel else "crc32c")