Replace -s (sector size) option with more general -t (disktype)

option which makes the vnd device emulate the geometry of the
specified disktab(5) entry. No change in behaviour or geometry
unless -t is used.

API for vnd configuration ioctl (VNDIOCSET) changes, so mount_vnd
must be in sync with kernel.

Tested & ok jsing@ 'Lovely' deraadt@

1 files changed, 18 insertions, 10 deletions

diff --git a/sbin/mount_vnd/mount_vnd.8 b/sbin/mount_vnd/mount_vnd.8
index a44c76af947..f71c47ac223 100644
--- a/sbin/mount_vnd/mount_vnd.8
+++ b/sbin/mount_vnd/mount_vnd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_vnd.8,v 1.14 2008/08/14 17:10:29 jsing Exp $
+.\"	$OpenBSD: mount_vnd.8,v 1.15 2008/09/03 23:24:25 krw Exp $
 .\"
 .\" Copyright (c) 1993 University of Utah.
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -49,7 +49,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: August 14 2008 $
+.Dd $Mdocdate: September 3 2008 $
 .Dt MOUNT_VND 8
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@
 .Op Fl K Ar rounds
 .Op Fl o Ar options
 .Op Fl S Ar saltfile
-.Op Fl s Ar secsize
+.Op Fl t Ar disktype
 .Ar image
 .Ar vnd_dev
 .Ek
@@ -72,7 +72,7 @@
 .Op Fl ckluv
 .Op Fl K Ar rounds
 .Op Fl S Ar saltfile
-.Op Fl s Ar secsize
+.Op Fl t Ar disktype
 .Ar vnd_dev
 .Ar image
 .Ek
@@ -210,12 +210,19 @@ If the salt filename is not specified using
 .Fl S ,
 it defaults to
 .Ar image Ns .slt .
-.It Fl s Ar secsize
-Specify the sector size, in bytes, to be used by the device.
-The default sector size is 512 bytes.
-If specified
-.Ar secsize
-must be a multiple of 512 bytes and cannot exceed 65536 bytes.
+.It Fl t Ar disktype
+Specify a
+.Ar disktype
+entry from the
+.Xr disktab 5
+database.
+The
+.Ar vnd_dev
+will have the sector size, sectors per track, and tracks per cylinder values
+of the specified
+.Ar disktype .
+The defaults are 512-byte sectors, 100 sectors per track and 1 track per
+cylinder.
 .It Fl u
 .Nm vnconfig
 only.
@@ -300,6 +307,7 @@ is not possible, because the image to be configured to a vnd itself
 resides on a file system that first has to be checked and mounted.
 .Sh SEE ALSO
 .Xr vnd 4 ,
+.Xr disktab 5 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
 .Xr swapon 8 ,