diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-01-30 08:29:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 08:29:58 -0600 |
| commit | 8bd6c24b50a34225763058c1daa28c8a8fe59098 (patch) | |
| tree | 211c13a3df56abe246d556eaf04d8208d12b5af4 /data | |
| parent | 02f7f91e3937f1622ba055847aa96b207d5ba754 (diff) | |
| parent | 287c3edbac7f308d3240bdec253f0e5103e8eca1 (diff) | |
| download | vyos-1x-8bd6c24b50a34225763058c1daa28c8a8fe59098.tar.gz vyos-1x-8bd6c24b50a34225763058c1daa28c8a8fe59098.zip | |
Merge pull request #2888 from vyos/mergify/bp/sagitta/pr-2886
system-option: T5979: Add configurable kernel boot options (backport #2886)
Diffstat (limited to 'data')
| -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 %} |