mirror of
https://github.com/nix-community/disko.git
synced 2024-08-15 01:10:28 +03:00
Merge remote-tracking branch 'lass/fix'
This commit is contained in:
commit
60bda6019f
@ -94,9 +94,9 @@ let {
|
||||
# attrValues returns values sorted by name. This is important, because it
|
||||
# ensures that "/" is processed before "/foo" etc.
|
||||
in ''
|
||||
${concatStringsSep "\n" (attrValues z.luks)}
|
||||
${concatStringsSep "\n" (attrValues z.lvm)}
|
||||
${concatStringsSep "\n" (attrValues z.fs)}
|
||||
${optionalString (hasAttr "luks" z) concatStringsSep "\n" (attrValues z.luks)}
|
||||
${optionalString (hasAttr "lvm" z) concatStringsSep "\n" (attrValues z.lvm)}
|
||||
${optionalString (hasAttr "luks" fs) concatStringsSep "\n" (attrValues z.fs)}
|
||||
'';
|
||||
|
||||
mount.luks = q: x: (
|
||||
|
Loading…
Reference in New Issue
Block a user