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

Don't use keyfile if there /boot is unencrypted

Browse Source
This commit is contained in:
Chrysostomus 2020-11-03 23:23:56 +02:00
parent 3eae98eac3
commit 9f52282e4c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,12 @@ _ = gettext.translation("calamares-python",
languages=libcalamares.utils.gettext_languages(), languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext fallback=True).gettext
unencrypted_separate_boot = False
for partition in partitions:
if (partition["mountPoint"] == "/boot"
and "luksMapperName" not in partition):
unencrypted_separate_boot = True
def pretty_name(): def pretty_name():
return _("Configuring OpenRC dmcrypt service.") return _("Configuring OpenRC dmcrypt service.")
@ -36,8 +42,8 @@ def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path):
if not has_luks and not skip_partitions: if not has_luks and not skip_partitions:
libcalamares.utils.debug( libcalamares.utils.debug(
"Skip writing OpenRC LUKS configuration for partition {!s}".format(partition["mountPoint"])) "Skip writing OpenRC LUKS configuration for partition {!s}".format(partition["mountPoint"]))
# Don't use keyfile if boot is unecrypted, keys must not be stored on unencrypted partitions
if has_luks and not skip_partitions: if has_luks and not skip_partitions and not unencrypted_separate_boot:
crypto_target = partition["luksMapperName"] crypto_target = partition["luksMapperName"]
crypto_source = "/dev/disk/by-uuid/{!s}".format(partition["uuid"]) crypto_source = "/dev/disk/by-uuid/{!s}".format(partition["uuid"])
libcalamares.utils.debug( libcalamares.utils.debug(