talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases 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
parent 3d6df9e8be 3936d85ec3
commit bbaff89ceb
1 changed files with 2 additions and 2 deletions
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 != "")
{ serviceConfig.ExecStartPre =
makeJobScript "${name}-pre-start" config.preStart;
[ (makeJobScript "${name}-pre-start" config.preStart) ];
})
(mkIf (config.script != "")
{ serviceConfig.ExecStart =
@@ -271,7 +271,7 @@ let
})
(mkIf (config.postStart != "")
{ serviceConfig.ExecStartPost =
makeJobScript "${name}-post-start" config.postStart;
[ (makeJobScript "${name}-post-start" config.postStart) ];
})
(mkIf (config.reload != "")
{ serviceConfig.ExecReload =