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

try to fix grub 7.7

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

3
system/bootloader.sls
View file

@ -13,6 +13,7 @@ system_bootloader_pkgs:
{% set CURRENT_SUBVOLUME_TIMESTAMP = salt['cmd.shell']('CURRENT_SUBVOLUME=$(LC_ALL=C btrfs sub show / | LC_ALL=C grep Name: | tr -d \'[:space:]\'); TIMESTAMP_FORMAT=\'[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}_[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}\'; echo "$CURRENT_SUBVOLUME" | grep -Eo "$TIMESTAMP_FORMAT"') %}
{% set CURRENT_SUBVOLUME_TIMESTAMP_HUMAN = salt['cmd.shell']('CURRENT_SUBVOLUME_TIMESTAMP=\'' + CURRENT_SUBVOLUME_TIMESTAMP + '\'; echo "${CURRENT_SUBVOLUME_TIMESTAMP:0:10} ${CURRENT_SUBVOLUME_TIMESTAMP:11:2}:${CURRENT_SUBVOLUME_TIMESTAMP:14:2}"') %}
{% set KERNEL_VERSION = salt['cmd.shell']('uname -r') %}
{% set ROOT_UUID = salt['cmd.shell']('lsblk -o LABEL,UUID | grep ROOT | awk \'{print $2}\'') %}
system_bootloader_install:
cmd.run:
@ -25,7 +26,7 @@ system_bootloader_default_grub:
file.keyvalue:
- name: /etc/default/grub
- key_values:
GRUB_CMDLINE_LINUX: '"console=ttyS0,19200n8net.ifnames=0 modules=sd-mod,usb-storage,btrfs rootfstype=btrfs root=LABEL=ROOT rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality"'
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"'
- separator: '='
- uncomment: '# '
- key_ignore_case: false