summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-11-02 07:36:42 +0000
committerngie <ngie@FreeBSD.org>2015-11-02 07:36:42 +0000
commite447d61e3e68cf15eb054294d3504bd38e172732 (patch)
tree9653c2260280ca1eedaf80f5974ece55aaf202c1 /usr.sbin
parent4ee0fbe912c0bd35107c107a7bced2bb8414434a (diff)
downloadFreeBSD-src-e447d61e3e68cf15eb054294d3504bd38e172732.zip
FreeBSD-src-e447d61e3e68cf15eb054294d3504bd38e172732.tar.gz
Sync makefs(8) content a bit with src/usr.sbin/makefs/makefs.8@1.53
Sections involving unimplemented filesystems (chfs, msdosfs, udf, v7fs) and options have been omitted. MFC after: 1 week Obtained from: NetBSD Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/makefs/makefs.839
1 files changed, 21 insertions, 18 deletions
diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index edecd4a..ab5632f 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -44,10 +44,10 @@
.Sh SYNOPSIS
.Nm
.Op Fl DxZ
-.Op Fl B Ar byte-order
+.Op Fl B Ar endian
.Op Fl b Ar free-blocks
.Op Fl d Ar debug-mask
-.Op Fl F Ar specfile
+.Op Fl F Ar mtree-specfile
.Op Fl f Ar free-files
.Op Fl M Ar minimum-size
.Op Fl m Ar maximum-size
@@ -69,9 +69,9 @@ from the directory tree
.Ar directory
or from the mtree manifest
.Ar manifest .
-If optional directory tree
+If any optional directory trees are passed in the
.Ar extra-directory
-is passed, then the directory tree of each argument will be merged
+arguments, then the directory tree of each argument will be merged
into the
.Ar directory
or
@@ -82,9 +82,9 @@ No special devices or privileges are required to perform this task.
.Pp
The options are as follows:
.Bl -tag -width flag
-.It Fl B Ar byte-order
+.It Fl B Ar endian
Set the byte order of the image to
-.Ar byte-order .
+.Ar endian .
Valid byte orders are
.Ql 4321 ,
.Ql big ,
@@ -114,9 +114,9 @@ Enable various levels of debugging, depending upon which bits are
set in
.Ar debug-mask .
XXX: document these
-.It Fl F Ar specfile
+.It Fl F Ar mtree-specfile
Use
-.Ar specfile
+.Ar mtree-specfile
as an
.Xr mtree 8
.Sq specfile
@@ -174,13 +174,13 @@ Set the maximum size of the file system image to
.Ar maximum-size .
An error will be raised if the target file system needs to be larger
than this to accommodate the provided directory tree.
-.It Fl N Ar dbdir
+.It Fl N Ar userdb-dir
Use the user database text file
.Pa master.passwd
and group database text file
.Pa group
from
-.Ar dbdir ,
+.Ar userdb-dir ,
rather than using the results from the system's
.Xr getpwnam 3
and
@@ -226,7 +226,9 @@ ISO 9660 file system.
.It Fl x
Exclude file system nodes not explicitly listed in the specfile.
.It Fl Z
-Create the image as a sparse file.
+Create a sparse file for
+.Sy ffs .
+This is useful for virtual machine images.
.El
.Pp
Where sizes are specified, a decimal number of bytes is expected.
@@ -339,7 +341,7 @@ Load a generic boot image into the first 32K of the cd9660 image.
.It Sy hard-disk-boot
Boot image is a hard disk image.
.It Sy keep-bad-images
-Do not throw away images whose write was aborted due to an error.
+Don't throw away images whose write was aborted due to an error.
For debugging purposes.
.It Sy label
Label name of the image.
@@ -372,11 +374,12 @@ The
utility appeared in
.Nx 1.6 .
.Sh AUTHORS
-.An Luke Mewburn Aq Mt lukem@NetBSD.org
-(original program)
-.An Daniel Watt
-.An Walter Deignan
-.An Ryan Gabrys
-.An Alan Perez-Rathke
+.An Luke Mewburn
+.Aq lukem@NetBSD.org
+(original program),
+.An Daniel Watt ,
+.An Walter Deignan ,
+.An Ryan Gabrys ,
+.An Alan Perez-Rathke ,
.An Ram Vedam
(cd9660 support)
OpenPOWER on IntegriCloud