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:49:06 +02:00
parent d2b5bb8c80
commit 5e0a60b670
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
system/bootloader.sls
View file

@ -69,6 +69,10 @@ system_bootloader_menuentry:
- require: - require:
- system_base_pkgs - system_base_pkgs
- system_bootloader_pkgs - system_bootloader_pkgs
file.replace:
- name: /etc/grub.d/40_custom
- pattern: {{ "# the 'exec tail' line above." | regex_escape }}
- repl: null
system_bootloader_config: system_bootloader_config:
cmd.run: cmd.run:
@ -84,7 +88,7 @@ system_bootloader_remove_default_menuentry:
- name: /efi/grub/grub.cfg - name: /efi/grub/grub.cfg
- marker_start: "### BEGIN /etc/grub.d/10_linux ###" - marker_start: "### BEGIN /etc/grub.d/10_linux ###"
- marker_end: "### END /etc/grub.d/10_linux ###" - marker_end: "### END /etc/grub.d/10_linux ###"
- content: "" - content: null
- require: - require:
- system_bootloader_install - system_bootloader_install
- system_bootloader_config - system_bootloader_config

2
system/files/bootloader_menuentry
View file

@ -1,3 +1,4 @@
cat <<EOF
menuentry 'Noveria Alpine {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}' --class alpine --class gnu-linux --class os $menuentry_id_option 'alpine-{{ CURRENT_SUBVOLUME_TIMESTAMP }}' { menuentry 'Noveria Alpine {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}' --class alpine --class gnu-linux --class os $menuentry_id_option 'alpine-{{ CURRENT_SUBVOLUME_TIMESTAMP }}' {
load_video load_video
insmod gzio insmod gzio
@ -9,3 +10,4 @@ menuentry 'Noveria Alpine {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}' --class alpin
echo 'Loading initial ramdisk ...' echo 'Loading initial ramdisk ...'
initrd /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/initramfs-lts initrd /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/initramfs-lts
} }
EOF