Merge pull request #97303 from martinetd/systemd-confinement-list
systemd-confinement: handle ExecStarts etc being lists
This commit is contained in:
commit
303078d9ca
@ -135,7 +135,7 @@ in {
|
|||||||
];
|
];
|
||||||
execPkgs = lib.concatMap (opt: let
|
execPkgs = lib.concatMap (opt: let
|
||||||
isSet = config.serviceConfig ? ${opt};
|
isSet = config.serviceConfig ? ${opt};
|
||||||
in lib.optional isSet config.serviceConfig.${opt}) execOpts;
|
in lib.flatten (lib.optional isSet config.serviceConfig.${opt})) execOpts;
|
||||||
unitAttrs = toplevelConfig.systemd.units."${name}.service";
|
unitAttrs = toplevelConfig.systemd.units."${name}.service";
|
||||||
allPkgs = lib.singleton (builtins.toJSON unitAttrs);
|
allPkgs = lib.singleton (builtins.toJSON unitAttrs);
|
||||||
unitPkgs = if fullUnit then allPkgs else execPkgs;
|
unitPkgs = if fullUnit then allPkgs else execPkgs;
|
||||||
|
Loading…
Reference in New Issue
Block a user