diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-vyos-image | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index a9027934..baabc7fe 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -164,9 +164,9 @@ if __name__ == "__main__": parser.add_argument('--dry-run', help='Check build configuration and exit', action='store_true') # Custom APT entry and APT key options can be used multiple times - parser.add_argument('--custom-apt-entry', help="Custom APT entry", action='append') - parser.add_argument('--custom-apt-key', help="Custom APT key file", action='append') - parser.add_argument('--custom-package', help="Custom package to install from repositories", action='append') + parser.add_argument('--custom-apt-entry', help="Custom APT entry", action='append', default=[]) + parser.add_argument('--custom-apt-key', help="Custom APT key file", action='append', default=[]) + parser.add_argument('--custom-package', help="Custom package to install from repositories", action='append', default=[]) # Build flavor is a positional argument parser.add_argument('build_flavor', help='Build flavor', nargs='?', action='store') @@ -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 @@ -412,7 +412,7 @@ if __name__ == "__main__": ## Create includes if has_nonempty_key(build_config, "includes_chroot"): for i in build_config["includes_chroot"]: - file_path = os.path.join(includes_chroot_dir, i["path"]) + file_path = os.path.join(chroot_includes_dir, i["path"]) os.makedirs(os.path.dirname(file_path), exist_ok=True) with open(file_path, 'w') as f: f.write(i["data"]) |