add an option -S for specifying the salt file for -K . If not given, user

is prompted like before.

ok tedu@ pedro@ otto@
manpage help and ok jmc@

1 files changed, 12 insertions, 2 deletions

diff --git a/usr.sbin/vnconfig/vnconfig.8 b/usr.sbin/vnconfig/vnconfig.8
index 353c018f4e7..bf87b315f84 100644
--- a/usr.sbin/vnconfig/vnconfig.8
+++ b/usr.sbin/vnconfig/vnconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vnconfig.8,v 1.29 2007/01/23 08:15:23 grunk Exp $
+.\"	$OpenBSD: vnconfig.8,v 1.30 2007/01/27 10:34:46 grunk Exp $
 .\"
 .\" Copyright (c) 1993 University of Utah.
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -44,6 +44,7 @@
 .Nm
 .Op Fl ckluv
 .Op Fl K Ar rounds
+.Op Fl S Ar saltfile
 .Ar rawdev
 .Ar regular_file
 .Sh DESCRIPTION
@@ -89,7 +90,11 @@ Associate an encryption key with the device.
 All data will be encrypted using the Blowfish cipher before it is
 written to the disk.
 The user is asked for both a passphrase and the name of a salt file.
-These are combined according to PKCS #5 PBKDF2 for the specified number of
+The salt file can also be specified on the command line using the
+.Fl S
+option.
+The passphrase and salt are combined according to PKCS #5 PBKDF2 for the
+specified number of
 rounds to generate the actual key used.
 .Ar rounds
 is a number between 1000 and
@@ -108,6 +113,11 @@ List the (s)vnd devices and indicate which ones are in use.
 If a specific
 .Ar rawdev
 is given, then only that one will be described.
+.It Fl S Ar saltfile
+When
+.Fl K
+is used, specify the
+.Pa saltfile .
 .It Fl u
 Unconfigures a
 .Ar rawdev .