Update bioctl(8) and softraid(4) to recent changes and enable softraid

crypto.  It's still considered experimental!

ok djm marco

3 files changed, 29 insertions, 7 deletions

diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8
index e836eeb90bc..7a1022457d4 100644
--- a/sbin/bioctl/bioctl.8
+++ b/sbin/bioctl/bioctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bioctl.8,v 1.53 2008/06/12 16:08:48 jmc Exp $
+.\"	$OpenBSD: bioctl.8,v 1.54 2008/06/14 00:16:38 hshoexer 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: June 12 2008 $
+.Dd $Mdocdate: June 14 2008 $
 .Dt BIOCTL 8
 .Os
 .Sh NAME
@@ -154,6 +154,22 @@ a raid level of 1:
 .Bd -literal -offset 3n
 # bioctl -c 1 -l /dev/sd2e,/dev/sd3e,/dev/sd4e,/dev/sd5e softraid0
 .Ed
+.Pp
+The following command, executed from the command line, would configure the
+device softraid0 with one special device (/dev/sd2e) and an encrypting
+volume:
+.Bd -literal -offset 3n
+# bioctl -c C -l /dev/sd2e softraid0
+.Ed
+.Pp
+.Nm
+will ask for a passphrase, that will be needed to unlock the encrypted
+disk.
+After creating a new encrypted disk, it should be zeroed with the
+following command (assuming the new disk is sd3):
+.Bd -literal -offset 3n
+# dd if=/dev/zero of=/dev/rsd3c
+.Ed
 .Sh SEE ALSO
 .Xr ami 4 ,
 .Xr arc 4 ,
@@ -174,3 +190,5 @@ The
 .Nm
 interface was written by
 .An Marco Peereboom Aq marco@openbsd.org .
+.Sh CAVEATS
+Currently, the use of the encrypting volume is considered experimental.
diff --git a/share/man/man4/softraid.4 b/share/man/man4/softraid.4
index 23a42ee5296..25b1289e54e 100644
--- a/share/man/man4/softraid.4
+++ b/share/man/man4/softraid.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: softraid.4,v 1.17 2008/01/29 10:26:56 jmc Exp $
+.\"	$OpenBSD: softraid.4,v 1.18 2008/06/14 00:16:38 hshoexer Exp $
 .\"
 .\" Copyright (c) 2007 Todd T. Fries   <todd@OpenBSD.org>
 .\" Copyright (c) 2007 Marco Peereboom <marco@OpenBSD.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 29 2008 $
+.Dd $Mdocdate: June 14 2008 $
 .Dt SOFTRAID 4
 .Os
 .Sh NAME
@@ -68,6 +68,12 @@ though at the cost of write speed.
 Unlike traditional RAID 1,
 .Nm
 supports the use of more than two disks in a RAID 1 setup.
+.It CRYPTO
+An
+.Em encrypting
+discipline.
+It encrypts data on a single disk to provide for data confidentiality.
+CRYPTO does not provide redundancy.
 .El
 .Pp
 A
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 4e7117b4b29..6243a8be7bb 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.113 2008/06/13 18:26:59 hshoexer Exp $ */
+/* $OpenBSD: softraid.c,v 1.114 2008/06/14 00:16:38 hshoexer Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -818,7 +818,6 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user)
 			strlcpy(sd->sd_name, "RAID 1", sizeof(sd->sd_name));
 			vol_size = ch_entry->src_meta.scm_coerced_size;
 			break;
-#if 0
 #ifdef CRYPTO
 		case 'C':
 			DNPRINTF(SR_D_IOCTL,
@@ -841,7 +840,6 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user)
 
 			break;
 #endif /* CRYPTO */
-#endif
 		default:
 			goto unwind;
 		}