git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #109976 from hercules-ci/systemd-allow-preStart-with-ExecStartPre
bbaff89Robert Hensing
nixos/modules/system/boot/systemd.nix+2−2
@@ -263,7 +263,7 @@ let
263 }
263 }
264 (mkIf (config.preStart != "")
264 (mkIf (config.preStart != "")
265 { serviceConfig.ExecStartPre =
265 { serviceConfig.ExecStartPre =
266− makeJobScript "${name}-pre-start" config.preStart;
266+ [ (makeJobScript "${name}-pre-start" config.preStart) ];
267 })
267 })
268 (mkIf (config.script != "")
268 (mkIf (config.script != "")
269 { serviceConfig.ExecStart =
269 { serviceConfig.ExecStart =
@@ -271,7 +271,7 @@ let
271 })
271 })
272 (mkIf (config.postStart != "")
272 (mkIf (config.postStart != "")
273 { serviceConfig.ExecStartPost =
273 { serviceConfig.ExecStartPost =
274− makeJobScript "${name}-post-start" config.postStart;
274+ [ (makeJobScript "${name}-post-start" config.postStart) ];
275 })
275 })
276 (mkIf (config.reload != "")
276 (mkIf (config.reload != "")
277 { serviceConfig.ExecReload =
277 { serviceConfig.ExecReload =