diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-09-01 20:34:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-01 20:34:10 +0200 |
| commit | 611550d23ffbb0a90a9fbe24a17ec2bbbb09458b (patch) | |
| tree | 800005343cc9425b7b6769173761e27d4e44f9d0 /src/conf_mode | |
| parent | 6d2523edeed89e0d968df13b7ec656de5bbd2952 (diff) | |
| parent | 2faaa23085bd5beee1ed1b8a63dfa5be84375841 (diff) | |
| download | vyos-1x-611550d23ffbb0a90a9fbe24a17ec2bbbb09458b.tar.gz vyos-1x-611550d23ffbb0a90a9fbe24a17ec2bbbb09458b.zip | |
Merge pull request #5437 from c-po/containerlab
T9269: fix issues after recent GRUB serial console rewrites to support VyOS in container
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/system_option.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/conf_mode/system_option.py b/src/conf_mode/system_option.py index 190db232d..6e7ced37a 100755 --- a/src/conf_mode/system_option.py +++ b/src/conf_mode/system_option.py @@ -600,6 +600,11 @@ def generate_cmdline_for_kexec(options): def apply(options): kexec_required, cmdline_new = generate_cmdline_for_kexec(options) + # T9269: a container does not own the Kernel cmdline - it belongs to the + # host system, thus neither kexec nor a reboot would apply anything and the + # options always compare as changed + if image.is_running_as_container(): + kexec_required = False if kexec_required: if not boot_configuration_complete() and os.getenv('VYOS_CONFIGD'): cmdl([ |