mirror of
https://github.com/nix-community/disko.git
synced 2024-09-11 06:25:33 +03:00
Merge pull request #21 from Baitinq/master
This commit is contained in:
commit
7328d8b41e
@ -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 ""}
|
||||
'';}
|
||||
);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user