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

---
 system/bootloader.sls             | 3 ++-
 system/files/bootloader_menuentry | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/bootloader.sls b/system/bootloader.sls
index ab02357..7f66568 100644
--- a/system/bootloader.sls
+++ b/system/bootloader.sls
@@ -26,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=UUID={{ ROOT_UUID }} rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality"'
+        GRUB_CMDLINE_LINUX: '"console=ttyS0,19200n8net.ifnames=0"'
     - separator: '='
     - uncomment: '# '
     - key_ignore_case: false
@@ -83,6 +83,7 @@ system_bootloader_menuentry:
     - context:
         CURRENT_SUBVOLUME_TIMESTAMP_HUMAN: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}
         CURRENT_SUBVOLUME_TIMESTAMP: {{ CURRENT_SUBVOLUME_TIMESTAMP }}
+        ROOT_UUID: {{ ROOT_UUID }}
     - mode: '0755'
     - require:
       - system_base_pkgs
diff --git a/system/files/bootloader_menuentry b/system/files/bootloader_menuentry
index d8023b7..ba85da1 100644
--- a/system/files/bootloader_menuentry
+++ b/system/files/bootloader_menuentry
@@ -6,7 +6,7 @@ menuentry 'Noveria Alpine {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}' --class alpin
   insmod btrfs
   search --label --set=root ROOT
   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 ...'
   initrd /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/initramfs-lts
 }