From 1f915fa541054cd2985afc4106747b9318891dc0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 20 Feb 2022 22:26:24 -0600
Subject: [PATCH] make sure devices are unmounted before formatting

---
 scripts/0-preinstall.sh | 3 +++
 scripts/3-post-setup.sh | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/0-preinstall.sh b/scripts/0-preinstall.sh
index 6633878..bea7ba7 100755
--- a/scripts/0-preinstall.sh
+++ b/scripts/0-preinstall.sh
@@ -49,6 +49,7 @@ echo -ne "
                     Formating Disk
 -------------------------------------------------------------------------
 "
+umount -A --recursive /mnt # make sure everything is unmounted before we start
 # disk prep
 sgdisk -Z ${DISK} # zap all on disk
 sgdisk -a 2048 -o ${DISK} # new gpt disk 2048 alignment
@@ -60,6 +61,8 @@ sgdisk -n 3::-0 --typecode=3:8300 --change-name=3:'ROOT' ${DISK} # partition 3 (
 if [[ ! -d "/sys/firmware/efi" ]]; then # Checking for bios system
     sgdisk -A 1:set:2 ${DISK}
 fi
+partprobe ${DISK} # reread partition table to ensure it is correct
+
 # make filesystems
 echo -ne "
 -------------------------------------------------------------------------
diff --git a/scripts/3-post-setup.sh b/scripts/3-post-setup.sh
index 048c05d..55cc4d9 100755
--- a/scripts/3-post-setup.sh
+++ b/scripts/3-post-setup.sh
@@ -124,8 +124,8 @@ sed -i 's/^%wheel ALL=(ALL:ALL) NOPASSWD: ALL/# %wheel ALL=(ALL:ALL) NOPASSWD: A
 sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
 sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
 
-rm -rv $HOME/ArchTitus
-rm -rv /home/$USERNAME/ArchTitus
+rm -r $HOME/ArchTitus
+rm -r /home/$USERNAME/ArchTitus
 
 # Replace in the same state
 cd $pwd