diff options
| author | jnqnfe <jnqnfe@gmail.com> | 2015-01-07 21:42:39 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-03-09 10:38:09 +0000 |
| commit | 7624527d7709d8cceb6e2507903e413ffb7dabc0 (patch) | |
| tree | 838b17a5a434cd20e9e21473a4a6ca07ca0eddcc /functions | |
| parent | 8008b57fc2c83ab59c03ce7dbdae31a5f5f5d8d0 (diff) | |
| download | vyos-live-build-7624527d7709d8cceb6e2507903e413ffb7dabc0.tar.gz vyos-live-build-7624527d7709d8cceb6e2507903e413ffb7dabc0.zip | |
defaults: ensure global caching param overrides specific caching params if disabled
Closes: #952923
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index fe35ce879..d254b079a 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -217,9 +217,16 @@ Set_defaults () # Setting cache option LB_CACHE="${LB_CACHE:-true}" - LB_CACHE_INDICES="${LB_CACHE_INDICES:-false}" - LB_CACHE_PACKAGES="${LB_CACHE_PACKAGES:-true}" - LB_CACHE_STAGES="${LB_CACHE_STAGES:-bootstrap}" + if [ "${LB_CACHE}" = "false" ] + then + LB_CACHE_INDICES="false" + LB_CACHE_PACKAGES="false" + LB_CACHE_STAGES="bootstrap" #bootstrap caching currently required for process to work + else + LB_CACHE_INDICES="${LB_CACHE_INDICES:-false}" + LB_CACHE_PACKAGES="${LB_CACHE_PACKAGES:-true}" + LB_CACHE_STAGES="${LB_CACHE_STAGES:-bootstrap}" + fi # Setting debconf frontend LB_DEBCONF_FRONTEND="${LB_DEBCONF_FRONTEND:-noninteractive}" |