fix Conflicting ID for duplicated include of linux.system.grub
diff --git a/linux/system/kernel.sls b/linux/system/kernel.sls
index 2873030..59b7177 100644
--- a/linux/system/kernel.sls
+++ b/linux/system/kernel.sls
@@ -3,11 +3,13 @@
{%- if system.kernel is defined %}
-{%- if system.kernel.isolcpu is defined %}
+{%- if system.kernel.isolcpu is defined or system.kernel.elevator is defined %}
include:
- linux.system.grub
+{%- if system.kernel.isolcpu is defined %}
+
/etc/default/grub.d/90-isolcpu.cfg:
file.managed:
- contents: 'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT isolcpus={{ system.kernel.isolcpu }}"'
@@ -22,9 +24,6 @@
{%- if system.kernel.elevator is defined %}
-include:
- - linux.system.grub
-
/etc/default/grub.d/91-elevator.cfg:
file.managed:
- contents: 'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT elevator={{ system.kernel.elevator }}"'
@@ -37,6 +36,8 @@
{%- endif %}
{%- endif %}
+{%- endif %}
+
{%- if system.kernel.version is defined %}
linux_kernel_package: