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

[initcpiocfg] add check for foreign swap

Browse Source
This commit is contained in:
Philip Müller 2020-02-24 17:29:06 +01:00
parent 93f20fb656
commit ee99e34e25
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,10 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
hooks.append("bootsplash-{!s}".format(bootsplash_theme)) hooks.append("bootsplash-{!s}".format(bootsplash_theme))
for partition in partitions: for partition in partitions:
if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
# Skip foreign swap
continue
if partition["fs"] == "linuxswap": if partition["fs"] == "linuxswap":
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if "luksMapperName" in partition: if "luksMapperName" in partition: