diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2021-02-12 08:50:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 08:50:52 +0000 |
| commit | 27f172ebd13f5df63563be91408c59c322e8b4dc (patch) | |
| tree | c9744b85f9df94698258d5e18d5d04c7bfdf9d18 | |
| parent | 15e3cfd76fd94e7ca3028d4f71127ae673c640d2 (diff) | |
| parent | 9486375887757abc92b78fe961f598b41b9353c3 (diff) | |
| download | nixpkgs-27f172ebd13f5df63563be91408c59c322e8b4dc.tar nixpkgs-27f172ebd13f5df63563be91408c59c322e8b4dc.tar.gz nixpkgs-27f172ebd13f5df63563be91408c59c322e8b4dc.tar.bz2 nixpkgs-27f172ebd13f5df63563be91408c59c322e8b4dc.tar.lz nixpkgs-27f172ebd13f5df63563be91408c59c322e8b4dc.tar.xz nixpkgs-27f172ebd13f5df63563be91408c59c322e8b4dc.tar.zst nixpkgs-27f172ebd13f5df63563be91408c59c322e8b4dc.zip | |
Merge pull request #112019 from 7c6f434c/fix-service-runner
nixos/service-runner: fix evaluation
| -rw-r--r-- | nixos/modules/testing/service-runner.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix index 99a9f979068..76e9d4a68c4 100644 --- a/nixos/modules/testing/service-runner.nix +++ b/nixos/modules/testing/service-runner.nix @@ -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"; |