diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-09-18 08:29:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 08:29:01 +0100 |
| commit | ead4cc2eba2d16b389f166e94e052567b9802494 (patch) | |
| tree | aba6a670838a41fe8845271e19d3d3675d822cf4 | |
| parent | 2a53f210eed9e8c7b862f232c5b5ee825da655dc (diff) | |
| parent | d991d8779b12f3bd43b40eaa50887008e0d580af (diff) | |
| download | vyos-build-ead4cc2eba2d16b389f166e94e052567b9802494.tar.gz vyos-build-ead4cc2eba2d16b389f166e94e052567b9802494.zip | |
Merge pull request #766 from dmbaturin/manifest-reuse-iso
build: T6653: fix a manifest generation error when using --reuse-iso
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 566c6a8b..8b2c0aa8 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -355,10 +355,18 @@ if __name__ == "__main__": # not to the vyos-build repository root. os.chdir(defaults.BUILD_DIR) + ## Initialize build manifest + manifest = { + 'build_config' : build_config, + 'artifacts' : [], + 'pre_build_config' : pre_build_config + } + iso_file = None if build_config["reuse_iso"]: iso_file = build_config["reuse_iso"] + manifest["artifacts"] = [iso_file] else: ## Create the version file @@ -548,13 +556,6 @@ if __name__ == "__main__": with open(file_path, 'w') as f: f.write(build_config["default_config"]) - ## Initialize build manifest - manifest = { - 'build_config' : build_config, - 'artifacts' : [iso_file], - 'pre_build_config' : pre_build_config - } - ## Configure live-build lb_config_tmpl = jinja2.Template(""" lb config noauto \ |