diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-01-23 19:10:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-23 19:10:20 +0000 |
| commit | d736a9b70ca897bdf1e0237b64ab5c7eb958b520 (patch) | |
| tree | eb4c7c191a126ecd6c4e9dec1da224c0b60b60fe /data/templates | |
| parent | 4c2d4519277bc4cbe964a37160b93c31cdc77309 (diff) | |
| parent | 256346a66cc3bb20e93c68245ebca2f68f42e7b5 (diff) | |
| download | vyos-1x-d736a9b70ca897bdf1e0237b64ab5c7eb958b520.tar.gz vyos-1x-d736a9b70ca897bdf1e0237b64ab5c7eb958b520.zip | |
Merge pull request #2886 from jestabro/add-kernel-boot-options
system-option: T5979: Add configurable kernel boot options
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 %} |