Fix menuentry state in bootloader.sls 7
This commit is contained in:
parent
4fa3f90b3c
commit
62f44a1467
1 changed files with 0 additions and 19 deletions
|
@ -55,17 +55,14 @@ system_bootloader_os-release:
|
|||
- key_ignore_case: False
|
||||
- append_if_not_found: True
|
||||
|
||||
{% if salt['cmd.shell']('ls /etc/grub.d | grep 10_linux') %}}
|
||||
system_bootloader_remove_default_menuentry:
|
||||
file.absent:
|
||||
- name: /etc/grub.d/10_linux
|
||||
- require:
|
||||
- system_bootloader_install
|
||||
- system_bootloader_config
|
||||
{% endif %}
|
||||
|
||||
system_bootloader_menuentry:
|
||||
{% if not salt['cmd.shell']('ls /etc/grub.d | grep 10_noveria') %}
|
||||
file.managed:
|
||||
- name: /etc/grub.d/10_noveria
|
||||
- source: salt://{{ tpldir }}/files/bootloader_menuentry
|
||||
|
@ -77,22 +74,6 @@ system_bootloader_menuentry:
|
|||
- system_base_pkgs
|
||||
- system_bootloader_pkgs
|
||||
- system_bootloader_remove_default_menuentry
|
||||
{% else %}
|
||||
file.replace:
|
||||
- name: /etc/grub.d/10_noveria
|
||||
- pattern: {{ "#!/bin/sh" | regex_escape }}
|
||||
- "''"
|
||||
- require:
|
||||
- system_base_pkgs
|
||||
- system_bootloader_pkgs
|
||||
file.prepend:
|
||||
- name: /etc/grub.d/10_noveria
|
||||
- source: salt://{{ tpldir }}/files/bootloader_menuentry
|
||||
- template: jinja
|
||||
- context:
|
||||
CURRENT_SUBVOLUME_TIMESTAMP_HUMAN: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}
|
||||
CURRENT_SUBVOLUME_TIMESTAMP: {{ CURRENT_SUBVOLUME_TIMESTAMP }}
|
||||
{% endif %}
|
||||
file.prepend:
|
||||
- name: /etc/grub.d/10_noveria
|
||||
- text: "#!/bin/sh"
|
||||
|
|
Loading…
Reference in a new issue