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

try to fix grub 7.8

Browse source
This commit is contained in:
LinuxSquare 2023-07-18 21:39:44 +02:00
parent cc004b176c
commit 970c6cc4a4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
system/bootloader.sls
View file

@ -26,7 +26,7 @@ system_bootloader_default_grub:
file.keyvalue: file.keyvalue:
- name: /etc/default/grub - name: /etc/default/grub
- key_values: - key_values:
GRUB_CMDLINE_LINUX: '"console=ttyS0,19200n8net.ifnames=0 modules=sd-mod,usb-storage,btrfs rootfstype=btrfs root=UUID={{ ROOT_UUID }} rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality"' GRUB_CMDLINE_LINUX: '"console=ttyS0,19200n8net.ifnames=0"'
- separator: '=' - separator: '='
- uncomment: '# ' - uncomment: '# '
- key_ignore_case: false - key_ignore_case: false
@ -83,6 +83,7 @@ system_bootloader_menuentry:
- context: - context:
CURRENT_SUBVOLUME_TIMESTAMP_HUMAN: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }} CURRENT_SUBVOLUME_TIMESTAMP_HUMAN: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}
CURRENT_SUBVOLUME_TIMESTAMP: {{ CURRENT_SUBVOLUME_TIMESTAMP }} CURRENT_SUBVOLUME_TIMESTAMP: {{ CURRENT_SUBVOLUME_TIMESTAMP }}
ROOT_UUID: {{ ROOT_UUID }}
- mode: '0755' - mode: '0755'
- require: - require:
- system_base_pkgs - system_base_pkgs

2
system/files/bootloader_menuentry
View file

@ -6,7 +6,7 @@ menuentry 'Noveria Alpine {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}' --class alpin
insmod btrfs insmod btrfs
search --label --set=root ROOT search --label --set=root ROOT
echo 'Loading Linux lts ...' echo 'Loading Linux lts ...'
linux /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/vmlinuz-lts linux /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/vmlinuz-lts modules=sd-mod,usb-storage,btrfs rootfstype=btrfs root=UUID={{ ROOT_UUID }} rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality
echo 'Loading initial ramdisk ...' echo 'Loading initial ramdisk ...'
initrd /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/initramfs-lts initrd /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/initramfs-lts
} }