diff options
| author | John Estabrook <jestabro@vyos.io> | 2026-01-16 15:26:20 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2026-01-17 21:53:38 -0600 |
| commit | e6ffde4985496017bea39551a396b1a87e3ff8a8 (patch) | |
| tree | 73856e18a13e927ce92dac11e0625f472a012006 /scripts | |
| parent | 0bf25369c6ff5a8fa14bcbfe0116b69021cf2fb2 (diff) | |
| download | vyos-build-e6ffde4985496017bea39551a396b1a87e3ff8a8.tar.gz vyos-build-e6ffde4985496017bea39551a396b1a87e3ff8a8.zip | |
build: T8185: fix install path for default configs in [[include_chroot]]
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index c4b34254..1d9508a1 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -586,7 +586,17 @@ DOCUMENTATION_URL="{build_config['documentation_url']}" ## Create includes if has_nonempty_key(build_config, "includes_chroot"): for i in build_config["includes_chroot"]: - file_path = os.path.join(chroot_includes_dir, i["path"]) + check_path = i["path"] + # T8185: flavor definition files containing a default config + # under [[includes_chroot]] may need corrected install path + if check_path == 'opt/vyatta/etc/config.boot.default': + file_path = os.path.join( + chroot_includes_dir, + directories['data'].lstrip(os.sep), + 'config.boot.default' + ) + else: + file_path = os.path.join(chroot_includes_dir, check_path) if debug: print(f"D: Creating chroot include file: {file_path}") os.makedirs(os.path.dirname(file_path), exist_ok=True) |