diff options
| -rwxr-xr-x | scripts/check-qemu-install | 2 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 89219c40..f29c5f3d 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -554,7 +554,7 @@ try: c.expect(op_mode_prompt) c.sendline('show system memory') c.expect(op_mode_prompt) - c.sendline("show version all | match vpp") + c.sendline('show version all | match "vpp|vyos-1x"') c.expect(op_mode_prompt) ################################################# diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 0614f214..d969c157 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -590,6 +590,15 @@ DOCUMENTATION_URL="{build_config['documentation_url']}" with open(file_path, 'w') as f: f.write(i["data"]) + if has_nonempty_key(build_config, "includes_binary"): + for i in build_config["includes_binary"]: + file_path = os.path.join(binary_includes_dir, i["path"]) + if debug: + print(f"D: Creating binary image include file: {file_path}") + os.makedirs(os.path.dirname(file_path), exist_ok=True) + with open(file_path, 'w') as f: + f.write(i["data"]) + ## Create the default config ## Technically it's just another includes.chroot entry, ## but it's special enough to warrant making it easier for flavor writers |