From bf0f2a89459d5bd48613f9b8b481d14b80f3f348 Mon Sep 17 00:00:00 2001
From: sean <sean>
Date: Tue, 23 Jul 2019 14:39:22 -0700
Subject: [PATCH] tweaks

---
 setup.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup.sh b/setup.sh
index 5e9646e..54e2355 100644
--- a/setup.sh
+++ b/setup.sh
@@ -309,14 +309,14 @@ echo "	exit 100">> /mnt/setup-chroot.sh
 echo "fi">> /mnt/setup-chroot.sh
 echo "echo PARTUUID=$(blkid -s PARTUUID -o value /dev/disk/by-id/${firstdisk}-part2) /boot/efi vfat nofail,x-systemd.device-timeout=0 0 1 >> /etc/fstab" >> /mnt/setup-chroot.sh
 
-echo "echo \"\"" >> /mnt/setup-chroot.sh
-echo "echo \"Mounting /boot/efi and cleaning past boot items...\"" >> /mnt/setup-chroot.sh
-echo "mount /boot/efi 2>&1 1>/dev/null" >> /mnt/setup-chroot.sh
+#echo "echo \"\"" >> /mnt/setup-chroot.sh
+#echo "echo \"Mounting /boot/efi...\"" >> /mnt/setup-chroot.sh
+#echo "mount /boot/efi 2>&1 1>/dev/null" >> /mnt/setup-chroot.sh
 # clear past boots
-echo "for f in \`efibootmgr -v | grep -e '^Boot[0-9]\\+' | sed 's/^Boot\\([0-9]*\\).*/\\1/g'\`; do efibootmgr -b \$f -B; done" >> /mnt/setup-chroot.sh
-echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
+#echo "for f in \`efibootmgr -v | grep -e '^Boot[0-9]\\+' | sed 's/^Boot\\([0-9]*\\).*/\\1/g'\`; do efibootmgr -b \$f -B; done" >> /mnt/setup-chroot.sh
+#echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 
-echo "errors=\$(apt install -y grub-efi-amd64-signed shim-signed 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
+echo "errors=\$(mount /boot/efi 2>&1 1>/dev/null && apt install -y grub-efi-amd64-signed shim-signed 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 echo 'if ! [ "$?" = "0" ]; then '>> /mnt/setup-chroot.sh
 echo '	echo "Failed to mount EFI partition or install grub-EFI - $errors"' >> /mnt/setup-chroot.sh
 echo "	exit 1">> /mnt/setup-chroot.sh