From 2b25805e7b1e570cd31cd94d0f4a4d075d4a22a2 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 23 Nov 2019 15:58:56 +0100 Subject: make stop slave switch also work in multi-slave mode --- lib/load-configuration | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/load-configuration') 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 -- cgit v1.2.3