grub installtest

2 files changed, 8 insertions, 11 deletions

diff --git a/0-preinstall.sh b/0-preinstall.sh
index b01f2d0..1ef4d2e 100755
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -112,16 +112,14 @@ pacstrap /mnt base base-devel linux linux-firmware vim nano sudo archlinux-keyri
 genfstab -U /mnt >> /mnt/etc/fstab
 echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf
 echo "--------------------------------------"
-echo "-- Bootloader Systemd Installation  --"
+echo "-- GRUB Bootloader Installation     --"
 echo "--------------------------------------"
 bootctl install --esp-path=/mnt/boot
-[ ! -d "/mnt/boot/loader/entries" ] && mkdir -p /mnt/boot/loader/entries
-cat <<EOF > /mnt/boot/loader/entries/arch.conf
-title Arch Linux  
-linux /vmlinuz-linux  
-initrd  /initramfs-linux.img  
-options root=LABEL=ROOT rw rootflags=subvol=@
-EOF
+if [[ ! -d "/sys/firmware/efi" ]]; then
+    grub-install --boot-directory=/mnt/boot ${DISK}
+else
+    grub-install --efi-directory=/mnt/boot ${DISK}
+fi
 cp -R ${SCRIPT_DIR} /mnt/root/ArchTitus
 cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
 echo "--------------------------------------"
diff --git a/3-post-setup.sh b/3-post-setup.sh
index 1b63457..a550d20 100755
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -10,14 +10,13 @@
 
 echo -e "\nFINAL SETUP AND CONFIGURATION"
 
+grub-mkconfig -o /boot/grub/grub.cfg
+
 # ------------------------------------------------------------------------
 
 echo -e "\nEnabling Login Display Manager"
-
 systemctl enable sddm.service
-
 echo -e "\nSetup SDDM Theme"
-
 cat <<EOF > /etc/sddm.conf
 [Theme]
 Current=Nordic