diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-09-18 10:00:11 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-09-18 10:00:11 +0200 |
| commit | b7b55dd11feb23b7d70fc2c1b0bbbf7fa759e3fb (patch) | |
| tree | 0e5982610e7a3584e3ac9d7088632967f36573e2 | |
| parent | 04605ce7fdf0ec3ac2a31f89bfb75ccff04a7a1e (diff) | |
| parent | ead4cc2eba2d16b389f166e94e052567b9802494 (diff) | |
| download | vyos-build-b7b55dd11feb23b7d70fc2c1b0bbbf7fa759e3fb.tar.gz vyos-build-b7b55dd11feb23b7d70fc2c1b0bbbf7fa759e3fb.zip | |
Merge branch 'vyos:current' into current
| -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 \ |