diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-02 20:44:02 +0100 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-02 20:44:02 +0100 |
| commit | 23ed83e730396d9af72343e126978418597c7deb (patch) | |
| tree | 82bdcba23b3f51592fcc4547c389460f1fc6f1fa | |
| parent | 640a25f78d312dbd2553ab11131de02a9de3b2f0 (diff) | |
| download | vyos-live-build-23ed83e730396d9af72343e126978418597c7deb.tar.gz vyos-live-build-23ed83e730396d9af72343e126978418597c7deb.zip | |
config: tweak config file loading order
load the base set of files first, then any user arch/dist specific override
files second.
this is important since whenever config items get moved in the base files,
this can break the override files, if an option specified in one was moved
to a different common file that it loaded after.
Gbp-Dch: Ignore
| -rwxr-xr-x | functions/conffile.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/functions/conffile.sh b/functions/conffile.sh index 09be0bcc6..dbe912be9 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -21,9 +21,10 @@ Get_conffiles () then FILES="${LB_CONFIG}" else + # List standard files first, then possible user arch/dist overrides + FILES="${@}" local FILE for FILE in "${@}"; do - FILES="${FILES} ${FILE}" FILES="${FILES} ${LB_ARCHITECTURE:+$FILE.$LB_ARCHITECTURE}" FILES="${FILES} ${LB_DISTRIBUTION:+$FILE.$LB_DISTRIBUTION}" done |