diff --git a/README.rst b/README.rst index fabc83d7..e0f823d4 100644 --- a/README.rst +++ b/README.rst @@ -705,6 +705,17 @@ Configure kernel boot options: - spectre_v2=off - nopti +Alternative way to set kernel boot options: + +.. code-block:: yaml + + linux: + system: + kernel: + transparent_hugepage: always + elevator: deadline + isolcpu: 1,2,3,4 + CPU ~~~ diff --git a/linux/system/kernel.sls b/linux/system/kernel.sls index 3dc30465..c4d181c8 100644 --- a/linux/system/kernel.sls +++ b/linux/system/kernel.sls @@ -6,6 +6,7 @@ {%- set kernel_boot_opts = [] %} {%- do kernel_boot_opts.append('isolcpus=' ~ system.kernel.isolcpu) if system.kernel.isolcpu is defined %} {%- do kernel_boot_opts.append('elevator=' ~ system.kernel.elevator) if system.kernel.elevator is defined %} +{%- do kernel_boot_opts.append('transparent_hugepage=' ~ system.kernel.transparent_hugepage) if system.kernel.transparent_hugepage is defined %} {%- do kernel_boot_opts.extend(system.kernel.boot_options) if system.kernel.boot_options is defined %} include: diff --git a/tests/pillar/system.sls b/tests/pillar/system.sls index 825b04b1..03ede585 100644 --- a/tests/pillar/system.sls +++ b/tests/pillar/system.sls @@ -37,6 +37,7 @@ linux: kernel: isolcpu: 1,2,3,4 elevator: deadline + transparent_hugepage: always boot_options: - pti=off - spectre_v2=auto