From e04cd38e6d36d9902d01e75ae511f7280b4da7c7 Mon Sep 17 00:00:00 2001
From: Thomas Cole <thomas.patrick.cole@gmail.com>
Date: Wed, 30 Jun 2021 09:36:31 -0400
Subject: [PATCH] Fix Bootloader issues

---
 archinstall.sh | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/archinstall.sh b/archinstall.sh
index b7a5d27..3c1bcf5 100755
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -21,7 +21,7 @@ MACADDRS=(
 
 DISK="/dev/vda"
 HOSTNAME="arch-testing"
-USER="CLC"
+USER="clc"
 PASSWD="$1$8nWcCPFE$SMC36PPfImzmQ9E3WEPvy1"
 ROOTPASSWD="$1$8g0M2I8t$GNnx5EkVhu1Ykw7NuKZos."
 
@@ -66,7 +66,7 @@ prechecks () {
 partition () {
     
 
-    echo " - Formatting disk..."
+    echoc " - Formatting disk..." $GREEN
         
     #DANGER ZONE
     parted --script $DISK -- mklabel gpt mkpart ESP fat32 1Mib 129MiB set 1 boot on mkpart primary ext4 129MiB 100%
@@ -78,7 +78,7 @@ partition () {
     mkfs.ext4 ${DISK}2
     #END DANGER ZONE
 
-    echo " - Mounting partitions..."
+    echoc " - Mounting partitions..." $GREEN
 
     mount ${DISK}2 /mnt
     mkdir /mnt/boot
@@ -87,19 +87,30 @@ partition () {
 }
 
 sysinstall () {
-    echo " - Updating mirror list. This might take a while."
+    echoc " - Updating mirror list. This might take a while." $YELLOW
     reflector --protocol https --sort rate --country 'United States' --save /etc/pacman.d/mirrorlist --verbose
     
-    echo " - Installing system."
+    echoc " - Installing system." $GREEN
     pacstrap /mnt
 
-    echo " - Installing bootloader."
+    echoc " - Installing bootloader." $GREEN
     arch-chroot /mnt bootctl install
 
-    echo " - Updating fstab."
+    cat <<EOF > /mnt/boot/loader/loader.conf
+    default arch
+    EOF
+
+    cat <<EOF > /mnt/boot/loader/entries/arch.conf
+    title    Arch Linux
+    linux    /vmlinuz-linux
+    initrd   /initramfs-linux.img
+    options  root=PARTUUID=$(blkid -s PARTUUID -o value "$part_root") rw
+    EOF
+
+    echoc " - Updating fstab." $GREEN
     genfstab -t PARTUUID /mnt >> /mnt/etc/fstab
 
-    echo " - Setting Hostname."
+    echoc " - Setting Hostname." $GREEN
     echo "$HOSTNAME" > /mnt/etc/HOSTNAME
 
     arch-chroot /mnt useradd -mU -s /bin/bash -G wheel,uucp,video,audio,storage,games,input $USER