diff options
author | makefu <github@syntax-fehler.de> | 2018-09-11 22:37:52 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-09-11 22:37:52 +0200 |
commit | 60bda6019f62fc8a94fd035c709e3efb2204c227 (patch) | |
tree | e2b307c054d5e020cbe29c876c730f3965213792 | |
parent | a252f8a57a78fb98388a497131b298fded7dee0d (diff) | |
parent | 52b077dabb8e0085c394fad364587a18fab34f00 (diff) |
Merge remote-tracking branch 'lass/fix'
-rw-r--r-- | lib/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/default.nix b/lib/default.nix index 16da93d..49c9daa 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -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: ( |