diff options
| author | makefu <github@syntax-fehler.de> | 2016-06-14 01:36:15 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-06-14 01:36:15 +0200 |
| commit | eb710a17e28bbec2a4f7877533f101fa78ece209 (patch) | |
| tree | 591878b08c6d051418928e7dd94bd0d21853157f /krebs/3modules/buildbot | |
| parent | 618684954207feed26b1b85f0721d41d5ca4c5c3 (diff) | |
| parent | 5bc3fa88543cdf3aa5b9103f7423a2af490b3d08 (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 |