summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-09-01 09:01:37 +0000
committerChristian Breunig <christian@breunig.cc>2026-09-01 17:28:55 +0200
commit2faaa23085bd5beee1ed1b8a63dfa5be84375841 (patch)
tree800005343cc9425b7b6769173761e27d4e44f9d0
parentfaeace4a37d890e9bfa1bc6b4584d0994853fb37 (diff)
downloadvyos-1x-2faaa23085bd5beee1ed1b8a63dfa5be84375841.tar.gz
vyos-1x-2faaa23085bd5beee1ed1b8a63dfa5be84375841.zip
system-option: T9269: no Kernel cmdline warning on containers
A container shares the Kernel with its host and does not own the Kernel cmdline, so the requested options never compare equal to /proc/cmdline. Every commit thus asked the user to save the configuration and reboot, which would not apply anything at all. Never treat a kexec as required when running as a container.
-rwxr-xr-xsrc/conf_mode/system_option.py5
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([