Merge pull request #21 from Baitinq/master

This commit is contained in:
Lassulus 2022-08-24 17:18:42 +02:00 committed by GitHub
commit 7328d8b41e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -76,8 +76,8 @@ let {
'';
create.luks = q: x: ''
cryptsetup -q luksFormat ${q.device} ${x.keyfile} ${toString (x.extraArgs or [])}
cryptsetup luksOpen ${q.device} ${x.name} --key-file ${x.keyfile}
cryptsetup -q luksFormat ${q.device} ${if builtins.hasAttr "keyfile" x then x.keyfile else ""} ${toString (x.extraArgs or [])}
cryptsetup luksOpen ${q.device} ${x.name} ${if builtins.hasAttr "keyfile" x then "--key-file " + x.keyfile else ""}
${create-f { device = "/dev/mapper/${x.name}"; } x.content}
'';
@ -141,7 +141,7 @@ let {
recursiveUpdate
(mount-f { device = "/dev/mapper/${x.name}"; } x.content)
{luks.${q.device} = ''
cryptsetup luksOpen ${q.device} ${x.name} --key-file ${x.keyfile}
cryptsetup luksOpen ${q.device} ${x.name} ${if builtins.hasAttr "keyfile" x then "--key-file " + x.keyfile else ""}
'';}
);