diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-11-09 20:47:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 20:47:08 +0100 |
| commit | 404791353fcb790add07c1ef067c56a656d270aa (patch) | |
| tree | 5b0cc0a373fafe2c6d0a1b405f7bc8ee1f54d571 /scripts/build-vyos-image | |
| parent | 77f4ba82f27552e2f395e1bd9d9b74c7368c03d2 (diff) | |
| parent | f4bc652b3ae761a7d82dcff3b177b0d7601cec7e (diff) | |
| download | vyos-build-404791353fcb790add07c1ef067c56a656d270aa.tar.gz vyos-build-404791353fcb790add07c1ef067c56a656d270aa.zip | |
Merge pull request #282 from jsimpso/merge_order
T4796: Prefer mix-in config over default config
Diffstat (limited to 'scripts/build-vyos-image')
| -rwxr-xr-x | scripts/build-vyos-image | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index 16b82281..57f3dfb1 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -216,15 +216,15 @@ if __name__ == "__main__": ## Load the flavor file and mix-ins with open(make_toml_path(defaults.BUILD_TYPES_DIR, build_config["build_type"]), 'r') as f: build_type_config = toml.load(f) - build_config = merge_dicts(build_config, build_type_config) + build_config = merge_dicts(build_type_config, build_config) with open(make_toml_path(defaults.BUILD_ARCHES_DIR, build_config["architecture"]), 'r') as f: build_arch_config = toml.load(f) - build_config = merge_dicts(build_config, build_arch_config) + build_config = merge_dicts(build_arch_config, build_config) with open(make_toml_path(defaults.BUILD_FLAVORS_DIR, build_config["build_flavor"]), 'r') as f: flavor_config = toml.load(f) - build_config = merge_dicts(build_config, flavor_config) + build_config = merge_dicts(flavor_config, build_config) ## Rename and merge some fields for simplicity ## E.g. --custom-packages is for the user, but internally |