public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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 = { instanceOptions = {
options = { options = sharedOptions // {
execConfig = mkOption { execConfig = mkOption {
default = {}; default = {};
example = { Parameters = "/bin/sh"; }; example = { Parameters = "/bin/sh"; };
@ -84,17 +83,19 @@ let
}; };
instanceToUnit = name: def: instanceToUnit = name: def:
{ text = '' let base = {
[Exec] text = ''
${attrsToSection def.execConfig} [Exec]
${attrsToSection def.execConfig}
[Files] [Files]
${attrsToSection def.filesConfig} ${attrsToSection def.filesConfig}
[Network] [Network]
${attrsToSection def.networkConfig} ${attrsToSection def.networkConfig}
''; '';
}; } // def;
in base // { unit = makeUnit name base; };
in { in {
@ -110,7 +111,7 @@ in {
config = config =
let 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 != {}) { in mkIf (cfg != {}) {
environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];