diff options
author | Erich Eckner <git@eckner.net> | 2019-06-20 09:31:38 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2019-06-20 09:31:38 +0200 |
commit | a20502b2ef5b4ba2701adc9185108039377d3938 (patch) | |
tree | 61510d2153f509ad8de7724b940d5806f46b1b96 | |
parent | 8e28653a9d8461183ec8ac9d32edcc8067c90e5a (diff) | |
download | builder-a20502b2ef5b4ba2701adc9185108039377d3938.tar.xz |
move default value assignment into lib/load-configuration; comment default value assignment in *.conf.example
-rwxr-xr-x | bin/build-packages | 3 | ||||
-rwxr-xr-x | conf/slave.conf.example | 2 | ||||
-rwxr-xr-x | lib/load-configuration | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/build-packages b/bin/build-packages index 1ed51d6..ca7c661 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -480,9 +480,6 @@ while [ "${count}" -ne 0 ] && \ fi fi - if test "x${archbuild_chroots}" = "x"; then - archbuild_chroots='/var/lib/archbuild' - fi if echo "${straw}" | \ grep -qF ':clean_chroot:'; then outerParameters="-c -r ${archbuild_chroots}" diff --git a/conf/slave.conf.example b/conf/slave.conf.example index 83b340e..52a7a3f 100755 --- a/conf/slave.conf.example +++ b/conf/slave.conf.example @@ -38,4 +38,4 @@ #mirror_update_command='' # where are the archbuild chroots stored -archbuild_chroots='/var/lib/archbuild/' +#archbuild_chroots='/var/lib/archbuild/' diff --git a/lib/load-configuration b/lib/load-configuration index 5eb65ad..4b72de3 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -114,6 +114,9 @@ mysql_command='mysql buildmaster' # automatically being marked as tested max_testing_duration="14" +# set default location of archbuild chroots +archbuild_chroots='/var/lib/archbuild' + # possibly pull in custom modifications if [ -r "${base_dir}/conf/common.conf" ]; then |