systemd-nspawn: fixes evaluation error

fixes #25097

(cherry picked from commit 522c16bd86)
This commit is contained in:
Jörg Thalheim
2017-05-21 19:23:09 +01:00
parent d3b66f9b94
commit 18e4687c38

View File

@@ -41,8 +41,7 @@ let
];
instanceOptions = {
options = {
options = sharedOptions // {
execConfig = mkOption {
default = {};
example = { Parameters = "/bin/sh"; };
@@ -82,18 +81,20 @@ let
};
instanceToUnit = name: def:
{ text = ''
[Exec]
${attrsToSection def.execConfig}
instanceToUnit = name: def:
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 {
@@ -109,7 +110,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 [] [];