From 4ea1459ebbc51e19f7e7e9985db450e521c54681 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 16 Jan 2021 09:08:48 -0500
Subject: install_system(): Move dir check to installer

Fixes:

    prokit: Using architecture i686-linux-glibc
    prokit: Using platform libiquity-testbench
    prokit: Using mirror http://files.proteanos.com/pub/proteanos
    prokit: Clearing MBR and partition table...
    prokit: Creating partition table...
    prokit: Creating file system...
    2 blocks
    prokit: Setting up root...
    prokit: Error: Directory "/tmp/prokit-2298865601/mount/block-1684450150" exists
---
(limited to 'src/installer/chroot.sh')

diff --git a/src/installer/chroot.sh b/src/installer/chroot.sh
index dcdadb4..f4d10a1 100644
--- a/src/installer/chroot.sh
+++ b/src/installer/chroot.sh
@@ -26,6 +26,11 @@ 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