From e30d576887dc331bb2c2b418321c6664b9d9d6b9 Mon Sep 17 00:00:00 2001
From: user <user@example.org>
Date: Mon, 5 Jun 2023 11:22:35 +0200
Subject: [PATCH] fix arch-install grubinstall function

---
 arch-install.sh              | 10 +---------
 scripts/extract-menuentry.py |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch-install.sh b/arch-install.sh
index 41dbb96..8a11bb1 100755
--- a/arch-install.sh
+++ b/arch-install.sh
@@ -731,21 +731,12 @@ function grubinstall() {
     fi
     [[ -z "${aufloesung}" ]] && aufloesung=auto
 
-    cp /opt/${repo}/configs/grub.d/10_linux ${mountpoint}/etc/grub.d/10_linux
-
     mkdir -p ${mountpoint}/boot/grub/themes/
     #cp -Rv /opt/${repo}/grub-config/themes/poly-light/ ${mountpoint}/boot/grub/themes/
     cp -Rv /opt/${repo}/grub-config/themes/Stylish/ ${mountpoint}/boot/grub/themes/
     cp -Rv /opt/${repo}/grub-config/themes/Vimix/ ${mountpoint}/boot/grub/themes/
     sed -i 's|GRUB_DISTRIBUTOR=.*$|GRUB_DISTRIBUTOR=\"'$repo'\"|' ${mountpoint}/etc/default/grub
     sed -i 's|GRUB_PRELOAD_MODULES=.*$|GRUB_PRELOAD_MODULES=\"part_gpt part_msdos zstd btrfs lvm\"|' ${mountpoint}/etc/default/grub
-
-    if [ "${verschluesselung}" == "y" ] || [ "y" == "${lvmsupport}" ]; then
-        sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*$|GRUB_CMDLINE_LINUX_DEFAULT=\"\"|' ${mountpoint}/etc/default/grub
-    else
-        sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*$|GRUB_CMDLINE_LINUX_DEFAULT=\"\"|' ${mountpoint}/etc/default/grub
-    fi
-
     #sed -i 's|GRUB_BACKGROUND=.*$|GRUB_BACKGROUND=\"\/usr\/share\/grub\/background.png\"|' ${mountpoint}/etc/default/grub
     #sed -i 's|GRUB_THEME=.*$|GRUB_THEME="\/boot\/grub\/themes\/poly-light\/theme.txt"|' ${mountpoint}/etc/default/grub
     sed -i 's|#GRUB_THEME=.*$|GRUB_THEME="\/boot\/grub\/themes\/Stylish\/theme.txt"|' ${mountpoint}/etc/default/grub
@@ -799,6 +790,7 @@ function grubinstall() {
     echo "GRUB_CMDLINE_LINUX_DEFAULT_ALT=\"${parameter}\"" >> ${mountpoint}/etc/default/grub
 
     echo "GRUB_DISABLE_OS_PROBER=true" >> ${mountpoint}/etc/default/grub
+    echo "GRUB_SAVEDEFAULT=true" >> ${mountpoint}/etc/default/grub
 }
 
 function btrfsformat() {
diff --git a/scripts/extract-menuentry.py b/scripts/extract-menuentry.py
index eea91ff..e59306d 100755
--- a/scripts/extract-menuentry.py
+++ b/scripts/extract-menuentry.py
@@ -21,7 +21,7 @@ def extract_menuentry(infile):
       if line.startswith(menuentry_start):
         in_menuentry = True
         match = re.search(r"menuentry '[^']+' (.*)", line)
-        print("menuentry '%s' %s" % (os.environ.get('GRUB_ALT_NAME', 'SpectreOS Linux alt'), match.group(1)))
+        print("menuentry '%s' %s" % (os.environ.get('GRUB_ALT_NAME', 'SpectreOS Linux alt (i3)'), match.group(1)))
         pass
       pass
     pass