From e7b95810cbb7b99c59dfbc5d26cb8c631ffc666c Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Sat, 17 Jan 2026 20:32:23 -0600 Subject: build: T8185: add vyos-1x directories dict to local utils --- scripts/image-build/utils.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/image-build/utils.py b/scripts/image-build/utils.py index 081327cd..9e6dc634 100644 --- a/scripts/image-build/utils.py +++ b/scripts/image-build/utils.py @@ -25,6 +25,9 @@ import shutil import defaults import vyos +from vyos.defaults import directories + + def check_build_config(): if not os.path.exists(defaults.BUILD_CONFIG): print("Build config file ({file}) does not exist".format(file=defaults.BUILD_CONFIG)) -- cgit v1.2.3 From 0bf25369c6ff5a8fa14bcbfe0116b69021cf2fb2 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 16 Jan 2026 15:20:16 -0600 Subject: build: T8185: correct the install path for entry [default_config] --- scripts/image-build/build-vyos-image | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 6919b003..c4b34254 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -97,6 +97,7 @@ import utils import raw_image from utils import cmd, rc_cmd +from utils import directories ## Check if there are missing build dependencies deps = { @@ -605,7 +606,11 @@ DOCUMENTATION_URL="{build_config['documentation_url']}" ## Technically it's just another includes.chroot entry, ## but it's special enough to warrant making it easier for flavor writers if has_nonempty_key(build_config, "default_config"): - file_path = os.path.join(chroot_includes_dir, "opt/vyatta/etc/config.boot.default") + file_path = os.path.join( + chroot_includes_dir, + directories['data'].lstrip(os.sep), + 'config.boot.default' + ) os.makedirs(os.path.dirname(file_path), exist_ok=True) with open(file_path, 'w') as f: f.write(build_config["default_config"]) -- cgit v1.2.3 From e6ffde4985496017bea39551a396b1a87e3ff8a8 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 16 Jan 2026 15:26:20 -0600 Subject: build: T8185: fix install path for default configs in [[include_chroot]] --- scripts/image-build/build-vyos-image | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'scripts') 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) -- cgit v1.2.3