diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-04-17 16:23:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-17 16:23:24 +0200 |
| commit | 54df1043f123f0c6f2140d8cf402657a7f0c9565 (patch) | |
| tree | 43087a46788bcd263d0c4928bebc9fbdc8a723dc /python/vyos/system/grub_util.py | |
| parent | 9deb059d3d781b1fdc0f3dd707590979426f3370 (diff) | |
| parent | 3fe5f8fb95a444ecb5b8489736a2e33419746f93 (diff) | |
| download | veeos-1x-54df1043f123f0c6f2140d8cf402657a7f0c9565.tar.gz veeos-1x-54df1043f123f0c6f2140d8cf402657a7f0c9565.zip | |
Merge pull request #4453 from c-po/kernel-cmdline-T7327
grub: T7327: honor "system option kernel" settings during image upgrade
Diffstat (limited to 'python/vyos/system/grub_util.py')
| -rw-r--r-- | python/vyos/system/grub_util.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/python/vyos/system/grub_util.py b/python/vyos/system/grub_util.py index 4a3d8795e..ad95bb4f9 100644 --- a/python/vyos/system/grub_util.py +++ b/python/vyos/system/grub_util.py @@ -56,13 +56,12 @@ def set_kernel_cmdline_options(cmdline_options: str, version: str = '', @image.if_not_live_boot def update_kernel_cmdline_options(cmdline_options: str, - root_dir: str = '') -> None: + root_dir: str = '', + version = image.get_running_image()) -> None: """Update Kernel custom cmdline options""" if not root_dir: root_dir = disk.find_persistence() - version = image.get_running_image() - boot_opts_current = grub.get_boot_opts(version, root_dir) boot_opts_proposed = grub.BOOT_OPTS_STEM + f'{version} {cmdline_options}' |