RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix paths used for steps in keyfile creation (#1851) 

* Fix paths used for steps in keyfile creation

* Simplify
This commit is contained in:
codefiles 2023-06-08 04:48:56 -04:00 committed by GitHub
parent 96d0eb1de9
commit de9b8d4f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/luks.py
View File

@ -187,8 +187,8 @@ class Luks2:
# Once we store the key as ../xyzloop.key systemd-cryptsetup can # Once we store the key as ../xyzloop.key systemd-cryptsetup can
# automatically load this key if we name the device to "xyzloop" # automatically load this key if we name the device to "xyzloop"
key_file_path = target_path / 'etc/cryptsetup-keys.d/' / self.mapper_name kf_path = Path(f'/etc/cryptsetup-keys.d/{self.mapper_name}.key')
key_file = key_file_path / '.key' key_file = target_path / kf_path.relative_to(kf_path.root)
crypttab_path = target_path / 'etc/crypttab' crypttab_path = target_path / 'etc/crypttab'
if key_file.exists(): if key_file.exists():
@ -198,15 +198,15 @@ class Luks2:
else: else:
info(f'Key file {key_file} already exists, overriding') info(f'Key file {key_file} already exists, overriding')
key_file_path.mkdir(parents=True, exist_ok=True) key_file.parent.mkdir(parents=True, exist_ok=True)
with open(key_file, "w") as keyfile: with open(key_file, "w") as keyfile:
keyfile.write(generate_password(length=512)) keyfile.write(generate_password(length=512))
key_file_path.chmod(0o400) key_file.chmod(0o400)
self._add_key(key_file) self._add_key(key_file)
self._crypttab(crypttab_path, key_file, options=["luks", "key-slot=1"]) self._crypttab(crypttab_path, kf_path, options=["luks", "key-slot=1"])
def _add_key(self, key_file: Path): def _add_key(self, key_file: Path):
info(f'Adding additional key-file {key_file}') info(f'Adding additional key-file {key_file}')