Skip to content

Commit

Permalink
nixos/service-runner: fix evaluation
Browse files Browse the repository at this point in the history
Follow-up to: nixos/systemd: allow preStart with other ExecStartPre cmdlines NixOS#109976

As the additional ExecStartPre and ExecStartPost are now lists, update
their processing by service-runner.nix

(cherry picked from commit 9486375)
  • Loading branch information
7c6f434c authored and mweinelt committed May 22, 2021
1 parent 885dbb2 commit c67af61
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nixos/modules/testing/service-runner.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ let
# Run the ExecStartPre program. FIXME: this could be a list.
my $preStart = <<END_CMD;
${service.serviceConfig.ExecStartPre or ""}
${concatStringsSep "\n" (service.serviceConfig.ExecStartPre or [])}
END_CMD
if (defined $preStart && $preStart ne "\n") {
print STDERR "running ExecStartPre: $preStart\n";
Expand All @@ -79,7 +79,7 @@ let
# Run the ExecStartPost program.
my $postStart = <<END_CMD;
${service.serviceConfig.ExecStartPost or ""}
${concatStringsSep "\n" (service.serviceConfig.ExecStartPost or [])}
END_CMD
if (defined $postStart && $postStart ne "\n") {
print STDERR "running ExecStartPost: $postStart\n";
Expand Down

0 comments on commit c67af61

Please sign in to comment.