From d2b5bb8c80c51675aea9f633c61c6547267ba2c2 Mon Sep 17 00:00:00 2001
From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com>
Date: Sun, 16 Jul 2023 20:31:26 +0200
Subject: [PATCH] Fix menuentry state in bootloader.sls

---
 system/bootloader.sls | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/system/bootloader.sls b/system/bootloader.sls
index 60fe47a..93385b9 100644
--- a/system/bootloader.sls
+++ b/system/bootloader.sls
@@ -31,14 +31,6 @@ system_bootloader_grub_dir:
       - system_bootloader_pkgs
       - system_bootloader_install
 
-system_bootloader_config:
-  cmd.run:
-    - name: 'grub-mkconfig -o /efi/grub/grub.cfg'
-    - require:
-      - system_bootloader_pkgs
-      - system_bootloader_install
-      - system_bootloader_grub_dir
-
 system_bootloader_mkinitfs_conf:
   file.keyvalue:
     - name: /etc/mkinitfs/mkinitfs.conf
@@ -63,16 +55,6 @@ system_bootloader_os-release:
     - key_ignore_case: False
     - append_if_not_found: True
 
-system_bootloader_remove_default_menuentry:
-  file.blockreplace:
-    - name: /efi/grub/grub.cfg
-    - marker_start: "### BEGIN /etc/grub.d/10_linux ###"
-    - marker_end: "### END /etc/grub.d/10_linux ###"
-    - content: ""
-    - require:
-      - system_bootloader_install
-      - system_bootloader_config
-
 system_bootloader_menuentry:
   file.blockreplace:
     - name: /etc/grub.d/40_custom
@@ -87,4 +69,22 @@ system_bootloader_menuentry:
     - require:
       - system_base_pkgs
       - system_bootloader_pkgs
-      - system_bootloader_remove_default_menuentry
+
+system_bootloader_config:
+  cmd.run:
+    - name: 'grub-mkconfig -o /efi/grub/grub.cfg'
+    - require:
+      - system_bootloader_pkgs
+      - system_bootloader_install
+      - system_bootloader_grub_dir
+      - system_bootloader_menuentry
+
+system_bootloader_remove_default_menuentry:
+  file.blockreplace:
+    - name: /efi/grub/grub.cfg
+    - marker_start: "### BEGIN /etc/grub.d/10_linux ###"
+    - marker_end: "### END /etc/grub.d/10_linux ###"
+    - content: ""
+    - require:
+      - system_bootloader_install
+      - system_bootloader_config