diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2024-05-07 12:06:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 12:06:54 +0300 |
| commit | 17e09a5804259eb80df074f75fb86cc169759455 (patch) | |
| tree | 98c0e7878b9e22cf0644550dcaf1d654dc56ed29 | |
| parent | 5412320d85d06bb162541fb6cef328891d465b13 (diff) | |
| parent | 3c3b74c4844393b7f099064088e41059ac44365b (diff) | |
| download | vyos-build-17e09a5804259eb80df074f75fb86cc169759455.tar.gz vyos-build-17e09a5804259eb80df074f75fb86cc169759455.zip | |
Merge pull request #597 from vyos/mergify/bp/sagitta/pr-596
build: T3664: modify the module-level template path instead of setting an environment variable (backport #596)
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/image-build/raw_image.py | 11 |
2 files changed, 8 insertions, 5 deletions
@@ -8,7 +8,7 @@ all: @echo "The most common target is 'iso'" %: - VYOS_TEMPLATE_DIR=`pwd`/packages/vyos-1x/data/templates/ ./build-vyos-image $* + ./build-vyos-image $* .PHONY: checkiso .ONESHELL: diff --git a/scripts/image-build/raw_image.py b/scripts/image-build/raw_image.py index ae061990..27fb27ab 100644 --- a/scripts/image-build/raw_image.py +++ b/scripts/image-build/raw_image.py @@ -22,6 +22,10 @@ import traceback import vyos.utils.process +import vyos.template + +vyos.template.DEFAULT_TEMPLATE_DIR = os.path.join(os.getcwd(), 'build/vyos-1x/data/templates') + SQUASHFS_FILE = 'live/filesystem.squashfs' VERSION_FILE = 'version.json' @@ -138,7 +142,6 @@ def setup_grub_configuration(build_config, root_dir) -> None: Args: root_dir (str): a path to the root of target filesystem """ - from vyos.template import render from vyos.system import grub print('I: Installing GRUB configuration files') @@ -149,13 +152,13 @@ def setup_grub_configuration(build_config, root_dir) -> None: grub_cfg_options = f'{root_dir}/{grub.CFG_VYOS_OPTIONS}' # create new files - render(grub_cfg_main, grub.TMPL_GRUB_MAIN, {}) + vyos.template.render(grub_cfg_main, grub.TMPL_GRUB_MAIN, {}) grub.common_write(root_dir) grub.vars_write(grub_cfg_vars, build_config["boot_settings"]) grub.modules_write(grub_cfg_modules, []) grub.write_cfg_ver(1, root_dir) - render(grub_cfg_menu, grub.TMPL_GRUB_MENU, {}) - render(grub_cfg_options, grub.TMPL_GRUB_OPTS, {}) + vyos.template.render(grub_cfg_menu, grub.TMPL_GRUB_MENU, {}) + vyos.template.render(grub_cfg_options, grub.TMPL_GRUB_OPTS, {}) def install_grub(con, version): from re import match |