From 5caa31726d2c68ddc7541d6a725d3ed51cd6aa1a Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 17 Jan 2016 12:05:29 -0500
Subject: cmd/installer-pc, block_mount): Check ret val of check_block()

---
diff --git a/src/block.sh b/src/block.sh
index f056305..fb6b921 100644
--- a/src/block.sh
+++ b/src/block.sh
@@ -40,7 +40,9 @@ block_mount()
 	local dev="${1}"
 	local dir=
 
-	check_block "${dev}"
+	if ! check_block "${dev}"; then
+		return 2
+	fi
 
 	rand
 	dir="$(get_vardata_dir 'mount')/block-$(printf '%010d' ${rand_x})"
diff --git a/src/cmd/installer-pc.sh b/src/cmd/installer-pc.sh
index 76112d2..b513f26 100644
--- a/src/cmd/installer-pc.sh
+++ b/src/cmd/installer-pc.sh
@@ -52,7 +52,9 @@ cmd_installer_pc_main()
 
 	suite="${1}"
 	dev="${2}"
-	check_block "${dev}"
+	if ! check_block "${dev}"; then
+		return 2
+	fi
 
 	if [ "x${suite%%:*}" != "x${suite}" ]; then
 		profile="${suite%%:*}"
--
cgit v0.9.1