napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[initcpiocfg] rework swap_uuid statement and filesystem hook

Browse Source
This commit is contained in:
Vitor Lopes 2020-12-08 16:34:58 +00:00 committed by Adriaan de Groot
parent 453e760709
commit 1fe27effe5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/initcpiocfg/main.py
View File

@ -134,6 +134,8 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
hooks.append("plymouth") hooks.append("plymouth")
for partition in partitions: for partition in partitions:
hooks.extend(["filesystems"])
if partition["fs"] == "linuxswap" and not partition.get("claimed", None): if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
# Skip foreign swap # Skip foreign swap
continue continue
@ -174,11 +176,9 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
hooks.append("lvm2") hooks.append("lvm2")
if swap_uuid != "": if swap_uuid != "":
hooks.extend(["resume"])
if encrypt_hook and openswap_hook: if encrypt_hook and openswap_hook:
hooks.extend(["openswap"]) hooks.extend(["openswap"])
hooks.extend(["resume", "filesystems"])
else:
hooks.extend(["filesystems"])
if btrfs and not is_cpu_intel: if btrfs and not is_cpu_intel:
modules.append("crc32c") modules.append("crc32c")