From 483cf90baa5986fd80845b53bbdb7904089ddb03 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 16 Jan 2021 09:31:33 -0500
Subject: Revert "install_system(): Move dir check to installer"

This reverts commit 4ea1459ebbc51e19f7e7e9985db450e521c54681.
---
(limited to 'src')

diff --git a/src/install.sh b/src/install.sh
index a1deaf9..54d474f 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -325,6 +325,10 @@ install_system()
 	shift 4
 
 	info "$(get_msg 'install_setting_up_chroot')"
+	if [ -d "${root}" ] && ! dir_is_empty "${root}" 'lost+found'; then
+		error "$(get_msg 'install_chroot_dir_exists')" "${root}"
+		return 1
+	fi
 	if ! mkdir -p -- "${root}/.prokit" "${root}/prokit"; then
 		error "$(get_msg 'install_mkdir_chroot_fail')" "${root}"
 		return 1
diff --git a/src/installer/chroot.sh b/src/installer/chroot.sh
index f4d10a1..dcdadb4 100644
--- a/src/installer/chroot.sh
+++ b/src/installer/chroot.sh
@@ -26,11 +26,6 @@ installer_chroot_main()
 	local foreign="${4}"
 	shift 4
 
-	if [ -d "${root}" ] && ! dir_is_empty "${root}" 'lost+found'; then
-		error "$(get_msg 'installer_chroot_dir_exists')" "${root}"
-		return 1
-	fi
-	
 	install_system "${arch}" "${plat}" "${root}" "${foreign}" || return 1
 	return 0
 }
--
cgit v0.9.1