Novos/salt-statetree
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix menuentry state in bootloader.sls

Browse source
This commit is contained in:
LinuxSquare 2023-07-16 20:31:26 +02:00
parent bb9bff45d2
commit d2b5bb8c80
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
system/bootloader.sls
View file

@ -31,14 +31,6 @@ system_bootloader_grub_dir:
- system_bootloader_pkgs - system_bootloader_pkgs
- system_bootloader_install - system_bootloader_install
system_bootloader_config:
cmd.run:
- name: 'grub-mkconfig -o /efi/grub/grub.cfg'
- require:
- system_bootloader_pkgs
- system_bootloader_install
- system_bootloader_grub_dir
system_bootloader_mkinitfs_conf: system_bootloader_mkinitfs_conf:
file.keyvalue: file.keyvalue:
- name: /etc/mkinitfs/mkinitfs.conf - name: /etc/mkinitfs/mkinitfs.conf
@ -63,16 +55,6 @@ system_bootloader_os-release:
- key_ignore_case: False - key_ignore_case: False
- append_if_not_found: True - append_if_not_found: True
system_bootloader_remove_default_menuentry:
file.blockreplace:
- name: /efi/grub/grub.cfg
- marker_start: "### BEGIN /etc/grub.d/10_linux ###"
- marker_end: "### END /etc/grub.d/10_linux ###"
- content: ""
- require:
- system_bootloader_install
- system_bootloader_config
system_bootloader_menuentry: system_bootloader_menuentry:
file.blockreplace: file.blockreplace:
- name: /etc/grub.d/40_custom - name: /etc/grub.d/40_custom
@ -87,4 +69,22 @@ system_bootloader_menuentry:
- require: - require:
- system_base_pkgs - system_base_pkgs
- system_bootloader_pkgs - system_bootloader_pkgs
- system_bootloader_remove_default_menuentry
system_bootloader_config:
cmd.run:
- name: 'grub-mkconfig -o /efi/grub/grub.cfg'
- require:
- system_bootloader_pkgs
- system_bootloader_install
- system_bootloader_grub_dir
- system_bootloader_menuentry
system_bootloader_remove_default_menuentry:
file.blockreplace:
- name: /efi/grub/grub.cfg
- marker_start: "### BEGIN /etc/grub.d/10_linux ###"
- marker_end: "### END /etc/grub.d/10_linux ###"
- content: ""
- require:
- system_bootloader_install
- system_bootloader_config