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

Simplify the generators

Browse Source
This commit is contained in:
Chrysostomus 2020-11-12 23:57:02 +02:00
parent 543a9e1afc
commit 8676ce9a20
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,9 +90,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
swap_outer_uuid = "" swap_outer_uuid = ""
swap_outer_mappername = None swap_outer_mappername = None
no_save_default = False no_save_default = False
unencrypted_separate_boot = False unencrypted_separate_boot = any(p["mountPoint"] == "/boot" and "luksMapperName" not in p for p in partitions):
if any(partition["mountPoint"] == "/boot" and "luksMapperName" not in partition for partition in partitions):
unencrypted_separate_boot = True
for partition in partitions: for partition in partitions:
if partition["mountPoint"] in ("/", "/boot") and partition["fs"] in ("btrfs", "f2fs"): if partition["mountPoint"] in ("/", "/boot") and partition["fs"] in ("btrfs", "f2fs"):

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

@ -29,9 +29,7 @@ def pretty_name():
def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path): def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path):
crypto_target = "" crypto_target = ""
crypto_source = "" crypto_source = ""
unencrypted_separate_boot = False unencrypted_separate_boot = any(p["mountPoint"] == "/boot" and "luksMapperName" not in p for p in partitions):
if any(partition["mountPoint"] == "/boot" and "luksMapperName" not in partition for partition in partitions):
unencrypted_separate_boot = True
for partition in partitions: for partition in partitions:
has_luks = "luksMapperName" in partition has_luks = "luksMapperName" in partition