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

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

diff --git a/system/bootloader.sls b/system/bootloader.sls
index b1dbed7..4c4abb6 100644
--- a/system/bootloader.sls
+++ b/system/bootloader.sls
@@ -55,17 +55,14 @@ system_bootloader_os-release:
     - key_ignore_case: False
     - append_if_not_found: True
 
-{% if salt['cmd.shell']('ls /etc/grub.d | grep 10_linux') %}}
 system_bootloader_remove_default_menuentry:
   file.absent:
     - name: /etc/grub.d/10_linux
     - require:
       - system_bootloader_install
       - system_bootloader_config
-{% endif %}
 
 system_bootloader_menuentry:
-  {% if not salt['cmd.shell']('ls /etc/grub.d | grep 10_noveria') %}
   file.managed:
     - name: /etc/grub.d/10_noveria
     - source: salt://{{ tpldir }}/files/bootloader_menuentry
@@ -77,22 +74,6 @@ system_bootloader_menuentry:
       - system_base_pkgs
       - system_bootloader_pkgs
       - system_bootloader_remove_default_menuentry
-  {% else %}
-  file.replace:
-    - name: /etc/grub.d/10_noveria
-    - pattern: {{ "#!/bin/sh" | regex_escape }}
-    - "''"
-    - require:
-      - system_base_pkgs
-      - system_bootloader_pkgs
-  file.prepend:
-    - name: /etc/grub.d/10_noveria
-    - source: salt://{{ tpldir }}/files/bootloader_menuentry
-    - template: jinja
-    - context:
-        CURRENT_SUBVOLUME_TIMESTAMP_HUMAN: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}
-        CURRENT_SUBVOLUME_TIMESTAMP: {{ CURRENT_SUBVOLUME_TIMESTAMP }}
-  {% endif %}
   file.prepend:
     - name: /etc/grub.d/10_noveria
     - text: "#!/bin/sh"