Allow specifying k/m/g/... suffixes in newfs(8) -S and -s options.

Useful for mount_mfs, now you can just say:

# mount_mfs -s 50m swap /tmp

And it will do what you want, taking into account sector size.

Old behaviour of -s (specifying count of sectors) is, of course,
preserved.

All the work was done by Vadim Zhukov (persgray(at)gmail com).

OK myself, otto@, thib@

1 files changed, 21 insertions, 9 deletions

diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index e39f590f57a..dc2cd4a53bd 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newfs.8,v 1.69 2011/03/31 11:17:58 sthen Exp $
+.\"	$OpenBSD: newfs.8,v 1.70 2011/05/23 10:56:17 dcoppa Exp $
 .\"	$NetBSD: newfs.8,v 1.12 1995/03/18 14:58:41 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)newfs.8	8.3 (Berkeley) 3/27/94
 .\"
-.Dd $Mdocdate: March 31 2011 $
+.Dd $Mdocdate: May 23 2011 $
 .Dt NEWFS 8
 .Os
 .Sh NAME
@@ -218,6 +218,13 @@ With this option,
 will not print extraneous information like superblock backups.
 .It Fl S Ar sector-size
 The size of a sector in bytes (almost always 512).
+Alternatively
+.Ar sector-size
+may instead use a multiplier, as documented in
+.Xr scan_scaled 3 .
+.Ar sector-size
+should be 512 or a multiple of it because the kernel operates
+512\-byte blocks internally.
 A sector is the smallest addressable unit on the physical device.
 Changing this is useful only when using
 .Nm
@@ -227,14 +234,19 @@ created (for example on a write-once disk).
 Note that changing this
 from its default will make it impossible for
 .Xr fsck 8
-to find the alternate superblocks if the standard superblock is
-lost.
+to find the alternate superblocks automatically if the standard
+superblock is lost.
 .It Fl s Ar size
-The size of the file system in sectors.
-This value is multiplied by the number of 512\-byte blocks in a sector
-to yield the size of the file system in 512\-byte blocks, which is the value
-used by the kernel.
-The maximum size of an FFS file system is 2,147,483,647 (2^31 \- 1) of these
+The size of the file system in sectors (see
+.Fl S ) .
+Alternatively
+.Ar size
+may instead use a multiplier, as documented in
+.Xr scan_scaled 3 ,
+to specify size in bytes; in this case
+.Ar size
+is rounded up to the next sector boundary.
+The maximum size of an FFS file system is 2,147,483,647 (2^31 \- 1) of
 512\-byte blocks, slightly less than 1 TB.
 FFS2 file systems can be as large as 64 PB.
 Note however that for