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

Merge pull request #2341 from vlinkz/luksswapmount

Browse Source 
Fix mounting encrypted swap partition
This commit is contained in:
Adriaan de Groot 2024-06-25 15:50:07 +02:00 committed by GitHub
commit 408cc5a5cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/mount/main.py
View File

@ -345,7 +345,8 @@ def run():
_("No partitions are defined for <pre>{!s}</pre> to use.").format("mount"))
# Find existing swap partitions that are part of the installation and enable them now
swap_devices = [p["device"] for p in partitions if (p["fs"] == "linuxswap" and p.get("claimed", False))]
swap_devices = [p["device"] for p in partitions if (p["fs"] == "linuxswap" and p.get("claimed", False) and p["fsName"] == "linuxswap")] \
+ ["/dev/mapper/" + p["luksMapperName"] for p in partitions if (p["fs"] == "linuxswap" and p.get("claimed", False) and (p["fsName"] == "luks" or p["fsName"] == "luks2"))]
enable_swap_partition(swap_devices)