diff options
| -rwxr-xr-x | bin/build-packages | 6 | ||||
| -rwxr-xr-x | lib/load-configuration | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/bin/build-packages b/bin/build-packages index 16521c9..be6bf16 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -1105,4 +1105,10 @@ while [ "${count}" -ne 0 ] && \ done +# remove the slave switch file if it exists (and if we are runnig on a slave) +if ! ${i_am_the_master}; then + SLAVE=$(whoami) + [ -f "/tmp/do-not-run-build-slave.$SLAVE" ] && rm "/tmp/do-not-run-build-slave.$SLAVE" +fi + >&2 echo 'Done.' diff --git a/lib/load-configuration b/lib/load-configuration index a6db76e..2a8f08c 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -33,13 +33,14 @@ else # is active. Remove the kill switch and return non-zero exit state, # effectively making systemd not restart the service - if [ -f '/tmp/do-not-run-build-slave' ]; then + SLAVE=$(whoami) + if [ -f "/tmp/do-not-run-build-slave.$SLAVE" ]; then >&2 echo "Build slave stop switch is ative.. I'll stop now." # When the buildslave is on "stop-now", # - systemd 'Restart' expects non-zero exit code # - interactively run commands SHOULD get exit code 1, too # - remove the switch file, so we can start the service again - [ -f '/tmp/do-not-run-build-slave' ] && rm '/tmp/do-not-run-build-slave' + [ -f "/tmp/do-not-run-build-slave.$SLAVE" ] && rm "/tmp/do-not-run-build-slave.$SLAVE" exit 1 fi fi |