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

[fstab] Fix unencrypted root check

Browse Source 
There are more ways (than not having a keyfile) for the root
partition to be unencrypted. Check it based on the settings
in the partition data.
This commit is contained in:
abalfoort 2022-05-19 19:47:55 +02:00 committed by Adriaan de Groot
parent 61c67f8c22
commit 4e5078c950
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/fstab/main.py
View File

@ -162,8 +162,10 @@ class FstabGenerator(object):
crypttab_options = self.crypttab_options crypttab_options = self.crypttab_options
# Set crypttab password for partition to none and remove crypttab options # Set crypttab password for partition to none and remove crypttab options
# if crypto_keyfile.bin was not generated # if root partition was not encrypted
if not os.path.exists(os.path.join(self.root_mount_point, "crypto_keyfile.bin")): if any([p["mountPoint"] == "/"
and "luksMapperName" not in p
for p in self.partitions]):
password = "none" password = "none"
crypttab_options = "" crypttab_options = ""
# on root partition when /boot is unencrypted # on root partition when /boot is unencrypted
@ -173,7 +175,6 @@ class FstabGenerator(object):
for p in self.partitions]): for p in self.partitions]):
password = "none" password = "none"
crypttab_options = "" crypttab_options = ""
return dict( return dict(
name=mapper_name, name=mapper_name,