public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41446 from aszlig/make-serviceconfig-overridable

Browse Source 
nixos/systemd: Allow to override serviceConfig
This commit is contained in:
Eelco Dolstra 2018-06-05 17:35:28 +02:00 committed by GitHub
commit 70faa56775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/system/boot/systemd-lib.nix
View File

@ -78,10 +78,16 @@ in rec {
optional (badFields != [ ]) optional (badFields != [ ])
"Systemd ${group} has extra fields [${concatStringsSep " " badFields}]."; "Systemd ${group} has extra fields [${concatStringsSep " " badFields}].";
checkUnitConfig = group: checks: v: checkUnitConfig = group: checks: attrs: let
let errors = concatMap (c: c group v) checks; in # We're applied at the top-level type (attrsOf unitOption), so the actual
if errors == [] then true # unit options might contain attributes from mkOverride that we need to
else builtins.trace (concatStringsSep "\n" errors) false; # convert into single values before checking them.
defs = mapAttrs (const (v:
if v._type or "" == "override" then v.content else v
)) attrs;
errors = concatMap (c: c group defs) checks;
in if errors == [] then true
else builtins.trace (concatStringsSep "\n" errors) false;
toOption = x: toOption = x:
if x == true then "true" if x == true then "true"