From d348e66c1198c04b568e51fe2f6a4daf3217d40a Mon Sep 17 00:00:00 2001
From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com>
Date: Sun, 16 Jul 2023 18:15:40 +0200
Subject: [PATCH] Try to fix cmdline

---
 system/bootloader.sls                 | 14 ++++----------
 system/files/bootloader_cmdline.jinja |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 system/files/bootloader_cmdline.jinja

diff --git a/system/bootloader.sls b/system/bootloader.sls
index 8784771..1d4e29e 100644
--- a/system/bootloader.sls
+++ b/system/bootloader.sls
@@ -12,7 +12,7 @@ system_bootloader_pkgs:
 
 system_bootloader_install:
   cmd.run:
-    - name: "grub-install --target=x86_64-efi --efi-directory=/efi"
+    - name: "grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=alpine-{{ CURRENT_SUBVOLUME_TIMESTAMP }}"
     - require:
       - system_bootloader_pkgs
 
@@ -68,15 +68,9 @@ system_bootloader_os-release:
       - system_bootloader_pkgs
 
 system_bootloader_cmdline:
-  file.managed:
-    - name: /proc/cmdline
-    - source: salt://{{ tpldir }}/files/bootloader_cmdline.jinja
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: '0644'
-    - context:
-        CURRENT_SUBVOLUME_TIMESTAMP: {{ CURRENT_SUBVOLUME_TIMESTAMP }}
+  file.append:
+    - name: /etc/default/grub
+    - text: 'GRUB_CMDLINE_LINUX_DEFAULT="root="LABEL=ROOT" rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality"'
     - require:
       - system_base_pkgs
       - system_bootloader_pkgs
diff --git a/system/files/bootloader_cmdline.jinja b/system/files/bootloader_cmdline.jinja
deleted file mode 100644
index c7a494b..0000000
--- a/system/files/bootloader_cmdline.jinja
+++ /dev/null
@@ -1 +0,0 @@
-root="LABEL=ROOT" rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality