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

Merge pull request #112019 from 7c6f434c/fix-service-runner

Browse Source 
nixos/service-runner: fix evaluation
This commit is contained in:
Michael Raskin 2021-02-12 08:50:52 +00:00 committed by GitHub
commit 27f172ebd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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. # Run the ExecStartPre program. FIXME: this could be a list.
my $preStart = <<END_CMD; my $preStart = <<END_CMD;
${service.serviceConfig.ExecStartPre or ""} ${concatStringsSep "\n" (service.serviceConfig.ExecStartPre or [])}
END_CMD END_CMD
if (defined $preStart && $preStart ne "\n") { if (defined $preStart && $preStart ne "\n") {
print STDERR "running ExecStartPre: $preStart\n"; print STDERR "running ExecStartPre: $preStart\n";
@ -79,7 +79,7 @@ let
# Run the ExecStartPost program. # Run the ExecStartPost program.
my $postStart = <<END_CMD; my $postStart = <<END_CMD;
${service.serviceConfig.ExecStartPost or ""} ${concatStringsSep "\n" (service.serviceConfig.ExecStartPost or [])}
END_CMD END_CMD
if (defined $postStart && $postStart ne "\n") { if (defined $postStart && $postStart ne "\n") {
print STDERR "running ExecStartPost: $postStart\n"; print STDERR "running ExecStartPost: $postStart\n";