From c3b83eb5988bff1534445502957eaa91f11b4dac Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 20 Jun 2019 09:01:46 +0200
Subject: added archbuild_chroots parameter for separating slaves

---
 bin/build-packages      | 6 +++---
 conf/slave.conf.example | 3 +++
 lib/load-configuration  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/build-packages b/bin/build-packages
index bb2ecba..9c69c5a 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -469,9 +469,9 @@ while [ "${count}" -ne 0 ] && \
 
         if echo "${straw}" | \
           grep -qF ':clean_chroot:'; then
-          outerParameters='-c'
+          outerParameters="-c -r ${archbuild_chroots}"
         else
-          outerParameters=''
+          outerParameters="-r ${archbuild_chroots}"
         fi
 
         innerParameters='--nocolor'
@@ -538,7 +538,7 @@ while [ "${count}" -ne 0 ] && \
           # sometimes it is necessary to manually remove the root/ build
           # directory (due to leftover mounts of /run) - so we just do
           # it everytime '-c' is set
-          recursively_umount_and_rm '/var/lib/archbuild/'"${build_command%-build}"
+          recursively_umount_and_rm "${archbuild_chroots}/""${build_command%-build}"
         fi
 
         echo 'building' > "${tmp_dir}/.ping-build-master"
diff --git a/conf/slave.conf.example b/conf/slave.conf.example
index ea03df7..83b340e 100755
--- a/conf/slave.conf.example
+++ b/conf/slave.conf.example
@@ -36,3 +36,6 @@
 # e.g. the one from /etc/pacman.d/mirrorlist32 (useful on build slaves which do not
 # have the master mirror in the mirrorlist32)
 #mirror_update_command=''
+
+# where are the archbuild chroots stored
+archbuild_chroots='/var/lib/archbuild/'
diff --git a/lib/load-configuration b/lib/load-configuration
index 8da872a..5eb65ad 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -129,7 +129,7 @@ fi
 
 if ! ${i_am_the_master} && \
   [ -r "${base_dir}/conf/slave.conf" ]; then
-  # shellcheck source=/dev/null
+  # shellcheck source=../conf/slave.conf.example
   . "${base_dir}/conf/slave.conf"
 fi
 
-- 
cgit v1.2.3