git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #109976 from hercules-ci/systemd-allow-preStart-with-ExecStartPre

nixos/systemd: allow preStart with other ExecStartPre cmdlines

commitbbaff89ceb389e9c21a90eefac60ebc9853144be authorRobert Hensing <roberth@users.noreply.github.com> dateFri 22 Jan 2021, 10:18 (6 years ago) parent3d6df9e3936d85
1 file changed+2−2
nixos/modules/system/boot/systemd.nix+2−2
nixos/modules/system/boot/systemd.nix+2−2
@@ -263,7 +263,7 @@ let
263263 }
264264 (mkIf (config.preStart != "")
265265 { serviceConfig.ExecStartPre =
266− makeJobScript "${name}-pre-start" config.preStart;
266+ [ (makeJobScript "${name}-pre-start" config.preStart) ];
267267 })
268268 (mkIf (config.script != "")
269269 { serviceConfig.ExecStart =
@@ -271,7 +271,7 @@ let
271271 })
272272 (mkIf (config.postStart != "")
273273 { serviceConfig.ExecStartPost =
274− makeJobScript "${name}-post-start" config.postStart;
274+ [ (makeJobScript "${name}-post-start" config.postStart) ];
275275 })
276276 (mkIf (config.reload != "")
277277 { serviceConfig.ExecReload =