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

fixup! systemd: Add prefix to unit script derivations

Browse Source 
* Avoid extra string interpolation.
This commit is contained in:
Kirill Elagin 2020-04-20 11:42:47 +03:00
parent a9e9d37fc8
commit daac85d991
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nixos/modules/system/boot/systemd.nix
View File

@ -265,34 +265,28 @@ let
environment.PATH = config.path; environment.PATH = config.path;
} }
(mkIf (config.preStart != "") (mkIf (config.preStart != "")
{ serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' { serviceConfig.ExecStartPre =
${config.preStart} makeJobScript "${name}-pre-start" config.preStart;
'';
}) })
(mkIf (config.script != "") (mkIf (config.script != "")
{ serviceConfig.ExecStart = makeJobScript "${name}-start" '' { serviceConfig.ExecStart =
${config.script} makeJobScript "${name}-start" config.script + " " + config.scriptArgs;
'' + " " + config.scriptArgs;
}) })
(mkIf (config.postStart != "") (mkIf (config.postStart != "")
{ serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" '' { serviceConfig.ExecStartPost =
${config.postStart} makeJobScript "${name}-post-start" config.postStart;
'';
}) })
(mkIf (config.reload != "") (mkIf (config.reload != "")
{ serviceConfig.ExecReload = makeJobScript "${name}-reload" '' { serviceConfig.ExecReload =
${config.reload} makeJobScript "${name}-reload" config.reload;
'';
}) })
(mkIf (config.preStop != "") (mkIf (config.preStop != "")
{ serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" '' { serviceConfig.ExecStop =
${config.preStop} makeJobScript "${name}-pre-stop" config.preStop;
'';
}) })
(mkIf (config.postStop != "") (mkIf (config.postStop != "")
{ serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" '' { serviceConfig.ExecStopPost =
${config.postStop} makeJobScript "${name}-post-stop" config.postStop;
'';
}) })
]; ];
}; };