applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-25 16:38:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1844 from dalto8/openswap

Browse source 
Add support for unlocking encrypted swap with root on a btrfs subvol
This commit is contained in:
Adriaan de Groot 2021-12-06 10:42:44 +01:00 • committed by GitHub
commit 47f2dd3c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/luksopenswaphookcfg/main.py
View file

@ -64,6 +64,11 @@ def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
elif lines[i].startswith("keyfile_filename"): elif lines[i].startswith("keyfile_filename"):
lines[i] = "keyfile_filename=crypto_keyfile.bin" lines[i] = "keyfile_filename=crypto_keyfile.bin"
elif lines[i].startswith("#keyfile_device_mount_options"):
if libcalamares.globalstorage.contains("btrfsRootSubvolume"):
btrfs_root_subvolume = libcalamares.globalstorage.value("btrfsRootSubvolume")
lines[i] = "keyfile_device_mount_options=--options=subvol=" + btrfs_root_subvolume.lstrip("/")
with open(os.path.join(root_mount_point, with open(os.path.join(root_mount_point,
openswap_conf_path), 'w') as openswap_file: openswap_conf_path), 'w') as openswap_file:
openswap_file.write("\n".join(lines) + "\n") openswap_file.write("\n".join(lines) + "\n")