summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-01-23 19:10:20 +0000
committerGitHub <noreply@github.com>2024-01-23 19:10:20 +0000
commitd736a9b70ca897bdf1e0237b64ab5c7eb958b520 (patch)
treeeb4c7c191a126ecd6c4e9dec1da224c0b60b60fe /src
parent4c2d4519277bc4cbe964a37160b93c31cdc77309 (diff)
parent256346a66cc3bb20e93c68245ebca2f68f42e7b5 (diff)
downloadvyos-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 'src')
-rwxr-xr-xsrc/conf_mode/system_option.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/conf_mode/system_option.py b/src/conf_mode/system_option.py
index d92121b3d..3b5b67437 100755
--- a/src/conf_mode/system_option.py
+++ b/src/conf_mode/system_option.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2019-2023 VyOS maintainers and contributors
+# Copyright (C) 2019-2024 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -22,6 +22,7 @@ from time import sleep
from vyos.config import Config
from vyos.configverify import verify_source_interface
+from vyos.system import grub_util
from vyos.template import render
from vyos.utils.process import cmd
from vyos.utils.process import is_systemd_service_running
@@ -39,7 +40,6 @@ time_format_to_locale = {
'24-hour': 'en_GB.UTF-8'
}
-
def get_config(config=None):
if config:
conf = config
@@ -87,6 +87,13 @@ def verify(options):
def generate(options):
render(curlrc_config, 'system/curlrc.j2', options)
render(ssh_config, 'system/ssh_config.j2', options)
+
+ cmdline_options = []
+ if 'kernel' in options:
+ if 'disable_mitigations' in options['kernel']:
+ cmdline_options.append('mitigations=off')
+ grub_util.update_kernel_cmdline_options(' '.join(cmdline_options))
+
return None
def apply(options):