From 60434269b8b8edccc6ce4ea705bd5340f237b1d8 Mon Sep 17 00:00:00 2001
From: mfgbhatti <mfgbhatti@live.com>
Date: Sat, 12 Feb 2022 22:45:23 +0000
Subject: [PATCH] minor update

---
 0-preinstall.sh | 1 +
 1-setup.sh      | 4 ++--
 startup.sh      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/0-preinstall.sh b/0-preinstall.sh
index fb621ec..3e549a3 100755
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -156,6 +156,7 @@ else
     PART2=${DISK}2
 fi
 
+set_option "PART2" "$PART2"
 
 if [[ "$LAYOUT" -eq 1 ]]; then
     do_partition
diff --git a/1-setup.sh b/1-setup.sh
index c70e939..8bf3567 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -171,7 +171,7 @@ grub)
         sed -i -e 's/GRUB_CMDLINE_LINUX="\(.\+\)"/GRUB_CMDLINE_LINUX="\1 cryptdevice=UUID='"${ENCRYP_UUID}"':luks"/g' -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cryptdevice=UUID'"${ENCRYP_UUID}"':luks"/g' /etc/default/grub
     fi
     if [[ "$UEFI" -eq 1 ]]; then
-        grub-install --target=x86_64-efi --efi-directory="$MOUNTPOINT"/boot --bootloader-id=GRUB --recheck
+        grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB --recheck
     else
         grub-install --target=i386-pc --recheck "$DISK"
     fi
@@ -181,7 +181,6 @@ systemd)
     if [[ "$UEFI" -eq 1 ]]; then
         echo "Installing systemd-boot"
         bootctl --path=/boot install
-
         if [[ $LUKS -eq 1 ]]; then
             echo -e "title\tArchTitus\nlinux\t/vmlinuz-linux\ninitrd\t/initramfs-linux.img\noptions\tcryptdevice=UUID=$ENCRYP_UUID:luks root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw" >/boot/loader/entries/arch.conf
         elif [[ $LVM -eq 1 ]]; then
@@ -198,6 +197,7 @@ systemd)
 uefi)
     if [[ "$UEFI" -eq 1 ]]; then
         echo "Installing efistub"
+        install_pkg efibootmgr
         if [[ "$LUKS" -eq 1 && "$FS" =~ "btrfs" ]]; then
             efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw rootflags=subvol=@ initrd=\\$IMG initrd=\initramfs-linux.img"
             efibootmgr --disk "$DISK" --part 1 --create --label "ArchTitus-Fallback" --loader "/vmlinuz-linux" --unicode "cryptdevice=PARTUUID=$PART_UUID:luks:allow-discards root=\/dev\/$LVM_VG\/${LVM_NAMES[0]} rw rootflags=subvol=@ initrd=\\$IMG initrd=\initramfs-linux-fallback.img"
diff --git a/startup.sh b/startup.sh
index 3e2d297..ac362b8 100644
--- a/startup.sh
+++ b/startup.sh
@@ -521,6 +521,7 @@ make_choice() {
                 set_keymap
                 ssd_drive
                 set_btrfs
+                set_option "BOOTLOADER" "grub"
                 set_option "FS" "btrfs"
                 set_option "DE" "default"
                 set_option "LAYOUT" 1