Browse Source

fix Conflicting ID for duplicated include of linux.system.grub

pull/130/head
Simon Schneider 7 years ago
parent
commit
502363e755
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      linux/system/kernel.sls

+ 5
- 4
linux/system/kernel.sls View File

@@ -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 @@ include:

{%- 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 @@ include:
{%- endif %}
{%- endif %}

{%- endif %}

{%- if system.kernel.version is defined %}

linux_kernel_package:

Loading…
Cancel
Save