From 65489cd1069b6e9cb592508103211984c43d3bbf Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Mon, 25 May 2015 20:33:22 -0400
Subject: Merge branch 'feature/block-device-mounting'

---
(limited to 'lib/cmd/install.sh')

diff --git a/lib/cmd/install.sh b/lib/cmd/install.sh
index ac817e0..a02a77c 100644
--- a/lib/cmd/install.sh
+++ b/lib/cmd/install.sh
@@ -21,6 +21,7 @@
 use getopt
 use feed
 use profile
+use block
 use dir
 use fd
 use pkg
@@ -41,6 +42,7 @@ cmd_install_main()
 	local profile=
 	local mirror=
 	local foreign=
+	local dev=
 
 	if ! get_options "${@}"; then
 		print_cmd_usage 'install' >&2
@@ -97,6 +99,12 @@ cmd_install_main()
 		foreign=false
 	fi
 
+	dev=''
+	if is_block "${chroot}"; then
+		dev="${chroot}"
+		chroot="$(block_mount "${dev}")"
+	fi
+
 	info "$(get_msg 'cmd_install_setting_up_chroot')"
 	if [ -d "${chroot}" ] && ! dir_is_empty "${chroot}" 'lost+found'; then
 		error 2 "$(get_msg 'cmd_install_chroot_dir_exists')" "${chroot}"
@@ -119,6 +127,10 @@ cmd_install_main()
 	fi
 
 	rm "${chroot}/prokit/installing"
+
+	if [ "x${dev}" != 'x' ]; then
+		block_umount "${chroot}"
+	fi
 }
 
 cmd_install_find_pkgs()
--
cgit v0.9.1