From a80b22f687d4be36f4fa8123fa10df26e3e9cb50 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Mon, 31 May 2021 17:17:40 +0200
Subject: [PATCH] Fixed conditional confustion in config existence check in
 ./install

---
 install                |  6 ++++--
 tests/vm-gentoo-zfs.sh | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/install b/install
index b46e3ba..7a30e04 100755
--- a/install
+++ b/install
@@ -109,10 +109,10 @@ if [[ -z "$ACTION" ]]; then
 	fi
 fi
 
-# Load config if we aren't just chrooting
 if [[ -e "$CONFIG" ]]; then
+	# Load config if we aren't just chrooting
 	[[ "$ACTION" == "chroot" ]] \
-		|| die "Configuration file '$CONFIG' does not exist. To run the configurator, omit '-i' or "
+		continue
 
 	# shellcheck disable=SC1090
 	source "$CONFIG" || die "Could not source config"
@@ -120,6 +120,8 @@ if [[ -e "$CONFIG" ]]; then
 		|| die "You have not properly read the config. Edit the config file and set I_HAVE_READ_AND_EDITED_THE_CONFIG_PROPERLY=true to continue."
 
 	preprocess_config
+elif [[ "$ACTION" != "chroot" ]]; then
+	die "Configuration file '$CONFIG' does not exist. To run the configurator, omit '-i' flag or run ./configure"
 fi
 
 [[ $EUID == 0 ]] \
diff --git a/tests/vm-gentoo-zfs.sh b/tests/vm-gentoo-zfs.sh
index f446e5a..d438919 100755
--- a/tests/vm-gentoo-zfs.sh
+++ b/tests/vm-gentoo-zfs.sh
@@ -7,11 +7,13 @@ virt-install \
 	--memory=2048 \
 	--cdrom=/vm/images/archlinux-2021.05.01-x86_64.iso \
 	--disk path=/vm/disks/disk-vm-gentoo-zfs.disk,size=25 \
-	--graphics none \
-	--console pty,target.type=virtio \
-	--serial pty \
-	--extra-args 'console=ttyS0,115200n8 --- console=ttyS0,115200n8' \
+	--transient \
+	--boot uefi \
 	--os-variant=gentoo \
 	--noautoconsole
+#	--graphics none \
+	# --console pty,target.type=virtio \
+	# --serial pty \
+	# --extra-args 'console=ttyS0,115200n8 --- console=ttyS0,115200n8' \
 
 # virsh