diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-07-25 19:29:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-25 19:29:09 +0200 |
| commit | b7a647ab55d6851205e2c5b53a5fe0c17c5146fe (patch) | |
| tree | be719010c44528d954e9ff0c12d09922a82d1835 /src | |
| parent | 819fcff25325c113ca18d9575c0fb03cff96a9af (diff) | |
| parent | 9e50d137213b6e86bb07c6b06577b304a1dbad53 (diff) | |
| download | vyos-1x-b7a647ab55d6851205e2c5b53a5fe0c17c5146fe.tar.gz vyos-1x-b7a647ab55d6851205e2c5b53a5fe0c17c5146fe.zip | |
Merge pull request #4623 from sever-sever/T7649-hyphen
T7649: Fix use hyphens instead of underscores for kernel options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/op_mode/image_installer.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index 8adf23c74..8c9d7eddd 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -514,44 +514,44 @@ def get_cli_kernel_options(config_file: str) -> list: if 'quiet' in kernel_options: cmdline_options.append('quiet') - if 'disable_hpet' in kernel_options: + if 'disable-hpet' in kernel_options: cmdline_options.append('hpet=disable') - if 'disable_mce' in kernel_options: + if 'disable-mce' in kernel_options: cmdline_options.append('mce=off') - if 'disable_softlockup' in kernel_options: + if 'disable-softlockup' in kernel_options: cmdline_options.append('nosoftlockup') # CPU options - isol_cpus = k_cpu_opts.get('isolate_cpus') + isol_cpus = k_cpu_opts.get('isolate-cpus') if isol_cpus: cmdline_options.append(f'isolcpus={isol_cpus}') - nohz_full = k_cpu_opts.get('nohz_full') + nohz_full = k_cpu_opts.get('nohz-full') if nohz_full: cmdline_options.append(f'nohz_full={nohz_full}') - rcu_nocbs = k_cpu_opts.get('rcu_no_cbs') + rcu_nocbs = k_cpu_opts.get('rcu-no-cbs') if rcu_nocbs: cmdline_options.append(f'rcu_nocbs={rcu_nocbs}') - if 'disable_nmi_watchdog' in k_cpu_opts: + if 'disable-nmi-watchdog' in k_cpu_opts: cmdline_options.append('nmi_watchdog=0') # Memory options - if 'disable_numa_balancing' in k_memory_opts: + if 'disable-numa-balancing' in k_memory_opts: cmdline_options.append('numa_balancing=disable') - default_hp_size = k_memory_opts.get('default_hugepage_size') + default_hp_size = k_memory_opts.get('default-hugepage-size') if default_hp_size: cmdline_options.append(f'default_hugepagesz={default_hp_size}') - hp_sizes = k_memory_opts.get('hugepage_size') + hp_sizes = k_memory_opts.get('hugepage-size') if hp_sizes: for size, settings in hp_sizes.items(): cmdline_options.append(f'hugepagesz={size}') - count = settings.get('hugepage_count') + count = settings.get('hugepage-count') if count: cmdline_options.append(f'hugepages={count}') |