mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-16 17:13:21 +00:00
Code Issues Wiki Activity

systemd-nspawn: fixes evaluation error

Browse source 
fixes #25097
This commit is contained in:
Jörg Thalheim 2017-05-21 19:23:09 +01:00
parent dcc6a69bae
commit 522c16bd86
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
nixos/modules/system/boot/systemd-nspawn.nix
View file

@ -42,8 +42,7 @@ let
];
instanceOptions = {
options = {
options = sharedOptions // {
execConfig = mkOption {
default = {};
example = { Parameters = "/bin/sh"; };
@ -84,17 +83,19 @@ let
};
instanceToUnit = name: def:
{ text = ''
[Exec]
${attrsToSection def.execConfig}
let base = {
text = ''
[Exec]
${attrsToSection def.execConfig}
[Files]
${attrsToSection def.filesConfig}
[Files]
${attrsToSection def.filesConfig}
[Network]
${attrsToSection def.networkConfig}
'';
};
[Network]
${attrsToSection def.networkConfig}
'';
} // def;
in base // { unit = makeUnit name base; };
in {
@ -110,7 +111,7 @@ in {
config =
let
units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg.instances;
units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg;
in mkIf (cfg != {}) {
environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];