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

Merge pull request #109976 from hercules-ci/systemd-allow-preStart-with-ExecStartPre

Browse Source 
nixos/systemd: allow preStart with other ExecStartPre cmdlines
This commit is contained in:
Robert Hensing 2021-01-22 10:18:11 +01:00 committed by GitHub
commit bbaff89ceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,7 @@ let
} }
(mkIf (config.preStart != "") (mkIf (config.preStart != "")
{ serviceConfig.ExecStartPre = { serviceConfig.ExecStartPre =
makeJobScript "${name}-pre-start" config.preStart; [ (makeJobScript "${name}-pre-start" config.preStart) ];
}) })
(mkIf (config.script != "") (mkIf (config.script != "")
{ serviceConfig.ExecStart = { serviceConfig.ExecStart =
@ -271,7 +271,7 @@ let
}) })
(mkIf (config.postStart != "") (mkIf (config.postStart != "")
{ serviceConfig.ExecStartPost = { serviceConfig.ExecStartPost =
makeJobScript "${name}-post-start" config.postStart; [ (makeJobScript "${name}-post-start" config.postStart) ];
}) })
(mkIf (config.reload != "") (mkIf (config.reload != "")
{ serviceConfig.ExecReload = { serviceConfig.ExecReload =