From 889853de4f60d067766717ddcd7997f48cc93afa Mon Sep 17 00:00:00 2001 From: kn Date: Fri, 26 Aug 2022 09:14:00 +0000 Subject: [PATCH] Sync usage with manual -l takes chunks not specials; while here, simplify markup for optional parts. Feedback OK jmc --- sbin/bioctl/bioctl.8 | 12 ++++++------ sbin/bioctl/bioctl.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8 index 5b324fdbb2e..21496f01dd6 100644 --- a/sbin/bioctl/bioctl.8 +++ b/sbin/bioctl/bioctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bioctl.8,v 1.109 2021/02/08 11:20:03 stsp Exp $ +.\" $OpenBSD: bioctl.8,v 1.110 2022/08/26 09:14:00 kn 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: February 8 2021 $ +.Dd $Mdocdate: August 26 2022 $ .Dt BIOCTL 8 .Os .Sh NAME @@ -42,10 +42,10 @@ .Pp .Nm bioctl .Op Fl dhiPqsv -.Op Fl C Ar flag Ns Op Pf , Ar flag Ns Op Pf , Ar ... +.Op Fl C Ar flag Ns Op Pf , Ar ... .Op Fl c Ar raidlevel .Op Fl k Ar keydisk -.Op Fl l Ar chunk Ns Op Pf , Ar chunk Ns Op Pf , Ar ... +.Op Fl l Ar chunk Ns Op Pf , Ar ... .Op Fl O Ar chunk | channel : Ns Ar target Ns Op Pf . Ar lun .Op Fl p Ar passfile .Op Fl R Ar chunk | channel : Ns Ar target Ns Op Pf . Ar lun @@ -183,7 +183,7 @@ the options for .Xr softraid 4 devices are as follows: .Bl -tag -width Ds -.It Fl C Ar flag Ns Op Pf , Ar flag Ns Op Pf , Ar ... +.It Fl C Ar flag Ns Op Pf , Ar ... Pass .Ar flag to @@ -249,7 +249,7 @@ Detach volume specified by Use special device .Ar keydisk as a key disk for a crypto volume. -.It Fl l Ar chunk Ns Op Pf , Ar chunk Ns Op Pf , Ar ... +.It Fl l Ar chunk Ns Op Pf , Ar ... Use the .Ar chunk device list to create a new volume within the diff --git a/sbin/bioctl/bioctl.c b/sbin/bioctl/bioctl.c index de782c4f293..0abfa26fb74 100644 --- a/sbin/bioctl/bioctl.c +++ b/sbin/bioctl/bioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bioctl.c,v 1.148 2022/08/19 17:49:10 kn Exp $ */ +/* $OpenBSD: bioctl.c,v 1.149 2022/08/26 09:14:00 kn Exp $ */ /* * Copyright (c) 2004, 2005 Marco Peereboom @@ -290,8 +290,8 @@ usage(void) "[-u channel:target[.lun]] " "device\n" " %s [-dhiPqsv] " - "[-C flag[,flag,...]] [-c raidlevel] [-k keydisk]\n" - "\t[-l special[,special,...]] " + "[-C flag[,...]] [-c raidlevel] [-k keydisk]\n" + "\t[-l chunk[,...]] " "[-O device | channel:target[.lun]]\n" "\t[-p passfile] [-R chunk | channel:target[.lun]]\n" "\t[-r rounds] " -- 2.20.1