From 40031af7d6eee9082207829a3e574bc104582ff5 Mon Sep 17 00:00:00 2001
From: Kenneth R Westerback <krw@cvs.openbsd.org>
Date: Sat, 25 Apr 2020 14:37:44 +0000
Subject: Reduce minimum allowed number of chunks in a CONCAT volume from 2 to
 1.

This increases the number of volumes that can be created on a single disk
from 7 to 15. i.e. a disk can be sliced into a maximum of 225
(15 * 15) filesystems instead of a mere 105 (7 * 15).

ok deraadt@
---
 sbin/bioctl/bioctl.8 | 10 +++++-----
 sbin/bioctl/bioctl.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sbin')

diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8
index 0be5695278b..2dac9bd9d8b 100644
--- a/sbin/bioctl/bioctl.8
+++ b/sbin/bioctl/bioctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bioctl.8,v 1.105 2018/07/09 14:10:58 schwarze Exp $
+.\"	$OpenBSD: bioctl.8,v 1.106 2020/04/25 14:37:43 krw Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Marco Peereboom
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 9 2018 $
+.Dd $Mdocdate: April 25 2020 $
 .Dt BIOCTL 8
 .Os
 .Sh NAME
@@ -226,11 +226,11 @@ CONCAT:
 A concatenating discipline.
 .El
 .Pp
-The RAID 0, RAID 1 and CONCAT disciplines require a minimum of two chunks to
+The CONCAT discipline requires a minimum of one chunk, RAID 0 and RAID 1
+disciplines require a minimum of two chunks, RAID 5 requires a minimum
+of three chunks and the CRYPTO discipline requires exactly one chunk to
 be provided via
 .Fl l .
-RAID 5 requires at least three chunks
-and the CRYPTO discipline requires exactly one.
 .It Fl d
 Delete volume specified by
 .Ar device .
diff --git a/sbin/bioctl/bioctl.c b/sbin/bioctl/bioctl.c
index 0353928f1ef..0bbfa24f1ba 100644
--- a/sbin/bioctl/bioctl.c
+++ b/sbin/bioctl/bioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bioctl.c,v 1.143 2019/06/28 13:32:43 deraadt Exp $ */
+/* $OpenBSD: bioctl.c,v 1.144 2020/04/25 14:37:43 krw Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Marco Peereboom
@@ -850,7 +850,7 @@ bio_createraid(u_int16_t level, char *dev_list, char *key_disk)
 		min_disks = 1;
 		break;
 	case 'c':
-		min_disks = 2;
+		min_disks = 1;
 		break;
 	default:
 		errx(1, "unsupported raid level");
-- 
cgit v1.2.3