summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2019-06-20 09:01:46 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2019-06-20 09:01:46 +0200
commitc3b83eb5988bff1534445502957eaa91f11b4dac (patch)
tree9c87473deefc2c3bf1aebfb6327a5f2741351252 /bin
parentc681b098f53f8fd86cbe720f643c1a528d2f2f60 (diff)
downloadbuilder-c3b83eb5988bff1534445502957eaa91f11b4dac.tar.xz
added archbuild_chroots parameter for separating slaves
Diffstat (limited to 'bin')
-rwxr-xr-xbin/build-packages6
1 files changed, 3 insertions, 3 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"