diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-01-22 21:01:00 -0600 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-01-23 19:11:30 +0000 |
| commit | 0cf188d74f145cdd859bb1495a2b02f16fca6298 (patch) | |
| tree | 5f0bcfebfc4f1745ece8e3f7935818128bbaf98e /data/templates | |
| parent | 4276133800e9aa5d5fb5a17faad77b185a68c7c3 (diff) | |
| download | vyos-1x-0cf188d74f145cdd859bb1495a2b02f16fca6298.tar.gz vyos-1x-0cf188d74f145cdd859bb1495a2b02f16fca6298.zip | |
image-tools: T5980: add support for configurable kernel boot options
(cherry picked from commit 1b1569d5b88a20994fc65fd529f8103db371bf3f)
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/grub/grub_vyos_version.j2 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/data/templates/grub/grub_vyos_version.j2 b/data/templates/grub/grub_vyos_version.j2 index 62688e68b..de85f1419 100644 --- a/data/templates/grub/grub_vyos_version.j2 +++ b/data/templates/grub/grub_vyos_version.j2 @@ -1,5 +1,10 @@ -{% set boot_opts_default = "boot=live rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/" + version_name %} -{% if boot_opts != '' %} +{% if boot_opts_config is vyos_defined %} +{% if boot_opts_config %} +{% set boot_opts_rendered = boot_opts_default + " " + boot_opts_config %} +{% else %} +{% set boot_opts_rendered = boot_opts_default %} +{% endif %} +{% elif boot_opts != '' %} {% set boot_opts_rendered = boot_opts %} {% else %} {% set boot_opts_rendered = boot_opts_default %} |