diff options
| -rwxr-xr-x | bin/build-packages | 15 | ||||
| -rwxr-xr-x | lib/load-configuration | 15 |
2 files changed, 1 insertions, 29 deletions
diff --git a/bin/build-packages b/bin/build-packages index e33faaa..be6bf16 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -65,8 +65,6 @@ usage() { >&2 echo ' Cannot be combined with -l.' >&2 echo ' -x: If package build fails, do not request new assignment(s).' >&2 echo ' Cannot be combined with -l.' - >&2 echo ' -S|--stop:' - >&2 echo ' Stop the slave gracefully (touching the stop switch file).' >&2 echo '' >&2 echo 'known straws (separated by and enclosed in ":", sets of straws separated by " "):' >&2 echo ' :clean_chroot:' @@ -89,14 +87,13 @@ usage() { } eval set -- "$( - getopt -o d:hl:n:p:s:t:uxS \ + getopt -o d:hl:n:p:s:t:ux \ --long diff: \ --long help \ --long local: \ --long prefer: \ --long straw: \ --long upload \ - --long stop \ -n "$(basename "$0")" -- "$@" || \ echo usage )" @@ -107,7 +104,6 @@ unset forced_package unset forced_straws unset prefered_package exit_after_failure=false -stop_slave=false timeout=0 while true @@ -150,9 +146,6 @@ do shift forced_straws="${forced_straws} $1" ;; - -S|--stop) - stop_slave=true - ;; -t) shift timeout="$1" @@ -177,12 +170,6 @@ if [ $# -ne 0 ]; then usage fi -if ${stop_slave}; then - SLAVE=$(whoami) - touch "/tmp/do-not-run-build-slave.$SLAVE" - exit 0 -fi - if [ -n "${diff_source_dir}" ]; then if [ -n "${count}" ] || \ [ -n "${forced_package}" ] || \ diff --git a/lib/load-configuration b/lib/load-configuration index 2a8f08c..b6756c1 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -28,21 +28,6 @@ if [ "$(hostname)" = 'buildmaster.archlinux32.org' ]; then fi else i_am_the_master=false - - # abort early or kill switch for slave in service (gracefull stop) - # is active. Remove the kill switch and return non-zero exit state, - # effectively making systemd not restart the service - - 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.$SLAVE" ] && rm "/tmp/do-not-run-build-slave.$SLAVE" - exit 1 - fi fi # dirty hack to get this stuff debugable from a bash |