Merge remote-tracking branch 'lass/fix'

This commit is contained in:
makefu 2018-09-11 22:37:52 +02:00
commit 60bda6019f
No known key found for this signature in database
GPG key ID: 36F7711F3FC0F225

View file

@ -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: (