mirror of
https://github.com/parchlinux/calamares.git
synced 2025-02-23 10:25:45 -05:00
Fix crypttab
This commit is contained in:
parent
cd4b8d4179
commit
25a6a5ee53
1 changed files with 6 additions and 1 deletions
|
@ -162,13 +162,18 @@ class FstabGenerator(object):
|
|||
crypttab_options = self.crypttab_options
|
||||
|
||||
# Set crypttab password for partition to none and remove crypttab options
|
||||
# if crypto_keyfile.bin was not generated
|
||||
if not os.path.exists(os.path.join(self.root_mount_point, "crypto_keyfile.bin")):
|
||||
password = "none"
|
||||
crypttab_options = ""
|
||||
# on root partition when /boot is unencrypted
|
||||
if partition["mountPoint"] == "/":
|
||||
elif partition["mountPoint"] == "/":
|
||||
if any([p["mountPoint"] == "/boot"
|
||||
and "luksMapperName" not in p
|
||||
for p in self.partitions]):
|
||||
password = "none"
|
||||
crypttab_options = ""
|
||||
|
||||
|
||||
return dict(
|
||||
name=mapper_name,
|
||||
|
|
Loading…
Add table
Reference in a new issue