diff options
| author | Erich Eckner <git@eckner.net> | 2018-05-25 10:52:34 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-05-25 10:52:34 +0200 |
| commit | 13d30d779dac2bb568f73bb0a028932586e6ec74 (patch) | |
| tree | c36bee5b7509ff86745ecf568f68ed8563631cca | |
| parent | 80103377b779450c3a470ddaa2d620c9fdf75491 (diff) | |
| download | builder-13d30d779dac2bb568f73bb0a028932586e6ec74.tar.xz | |
lib/load-configuration: legacily load conf/local.conf, too
| -rwxr-xr-x | lib/load-configuration | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/load-configuration b/lib/load-configuration index 095cadd..7e0ed11 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -102,6 +102,12 @@ mysql_command='mysql buildmaster' # possibly pull in custom modifications +# TODO: remove this legacy part here +if [ -r "${base_dir}/conf/local.conf" ]; then + # shellcheck source=/dev/null + "${base_dir}/conf/local.conf" +fi + if [ -r "${base_dir}/conf/common.conf" ]; then # shellcheck source=/dev/null "${base_dir}/conf/common.conf" |