diff options
| author | lassulus <lass@aidsballs.de> | 2016-06-13 13:50:52 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-06-13 13:50:52 +0200 |
| commit | 23385c2984c9d4fbff65c920d9d59bc29314a639 (patch) | |
| tree | d7e4f635be78922359b21970f6a6c8731995e38d /krebs/3modules/buildbot | |
| parent | de43b0e6f50e4d044cc0609a3d7d7c7d869552fe (diff) | |
| parent | 2dd4dbbf6ea77972c7d5edb0ec25b8e778bfeb50 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/buildbot')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 3 | ||||
| -rw-r--r-- | krebs/3modules/buildbot/slave.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 2a1dbe31a..c365798f3 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -345,8 +345,7 @@ let Type = "forking"; PIDFile = "${workdir}/twistd.pid"; # TODO: maybe also prepare buildbot.tac? - ExecStartPre = pkgs.writeScript "buildbot-master-init" '' - #!/bin/sh + ExecStartPre = pkgs.writeDash "buildbot-master-init" '' set -efux if [ ! -e ${workdir} ];then mkdir -p ${workdir} diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix index 248b46132..02331ee12 100644 --- a/krebs/3modules/buildbot/slave.nix +++ b/krebs/3modules/buildbot/slave.nix @@ -159,8 +159,7 @@ let Type = "forking"; PIDFile = "${workdir}/twistd.pid"; # TODO: maybe also prepare buildbot.tac? - ExecStartPre = pkgs.writeScript "buildbot-master-init" '' - #!/bin/sh + ExecStartPre = pkgs.writeDash "buildbot-master-init" '' set -efux mkdir -p ${workdir}/info cp ${buildbot-slave-init} ${workdir}/buildbot.tac |