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

nixos/service-runner: fix evaluation

Browse Source 
Follow-up to: nixos/systemd: allow preStart with other ExecStartPre cmdlines #109976

As the additional ExecStartPre and ExecStartPost are now lists, update
their processing by service-runner.nix
This commit is contained in:
Michael Raskin 2021-02-05 12:57:32 +01:00
parent 24e5fe6075
commit 9486375887
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/testing/service-runner.nix
View File

@ -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";
@ -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";