Browse Source

move default value assignment into lib/load-configuration; comment default value assignment in *.conf.example

Erich Eckner 3 months ago
parent
commit
a20502b2ef
3 changed files with 4 additions and 4 deletions
  1. 0
    3
      bin/build-packages
  2. 1
    1
      conf/slave.conf.example
  3. 3
    0
      lib/load-configuration

+ 0
- 3
bin/build-packages View File

@@ -480,9 +480,6 @@ while [ "${count}" -ne 0 ] && \
480 480
           fi
481 481
         fi
482 482
 
483
-        if test "x${archbuild_chroots}" = "x"; then
484
-          archbuild_chroots='/var/lib/archbuild'
485
-        fi
486 483
         if echo "${straw}" | \
487 484
           grep -qF ':clean_chroot:'; then
488 485
           outerParameters="-c -r ${archbuild_chroots}"

+ 1
- 1
conf/slave.conf.example View File

@@ -38,4 +38,4 @@
38 38
 #mirror_update_command=''
39 39
 
40 40
 # where are the archbuild chroots stored
41
-archbuild_chroots='/var/lib/archbuild/'
41
+#archbuild_chroots='/var/lib/archbuild/'

+ 3
- 0
lib/load-configuration View File

@@ -114,6 +114,9 @@ mysql_command='mysql buildmaster'
114 114
 # automatically being marked as tested
115 115
 max_testing_duration="14"
116 116
 
117
+# set default location of archbuild chroots
118
+archbuild_chroots='/var/lib/archbuild'
119
+
117 120
 # possibly pull in custom modifications
118 121
 
119 122
 if [ -r "${base_dir}/conf/common.conf" ]; then