vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #596 from dmbaturin/T3664-no-env-var

Browse Source 
build: T3664: modify the module-level template path instead of setting an environment variable
This commit is contained in:
Viacheslav Hletenko 2024-05-07 12:02:03 +03:00 committed by GitHub
commit dc0bcca3cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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:

11
scripts/image-build/raw_image.py
View File

@ -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