From cc004b176c4ae6dfab51f121ec40ab7d7210cee0 Mon Sep 17 00:00:00 2001
From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com>
Date: Tue, 18 Jul 2023 21:28:39 +0200
Subject: [PATCH] try to fix grub 7.7

---
 system/bootloader.sls | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/bootloader.sls b/system/bootloader.sls
index 57ba1dd..ab02357 100644
--- a/system/bootloader.sls
+++ b/system/bootloader.sls
@@ -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