Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MFC r254397:

  Mark the makefs(8) '-p' flag as deprecated in preference for
  the '-Z' flag for compatibility with NetBSD.

Approved by:	re (rodrigc)
  • Loading branch information...
commit 70e48419c0ea1e741837ffce90731959d0e7cbb9 1 parent 12761ca
gjb authored
Showing with 16 additions and 5 deletions.
  1. +8 −3 usr.sbin/makefs/makefs.8
  2. +8 −2 usr.sbin/makefs/makefs.c
11 usr.sbin/makefs/makefs.8
View
@@ -35,7 +35,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 22, 2012
+.Dd August 16, 2013
.Dt MAKEFS 8
.Os
.Sh NAME
@@ -43,7 +43,7 @@
.Nd create a file system image from a directory tree or a mtree manifest
.Sh SYNOPSIS
.Nm
-.Op Fl Dpx
+.Op Fl DxZ
.Op Fl B Ar byte-order
.Op Fl b Ar free-blocks
.Op Fl d Ar debug-mask
@@ -191,7 +191,10 @@ Set file system specific options.
is a comma separated list of options.
Valid file system specific options are detailed below.
.It Fl p
-Create the image as a sparse file.
+Deprecated.
+See the
+.Fl Z
+flag.
.It Fl S Ar sector-size
Set the file system sector size to
.Ar sector-size .
@@ -213,6 +216,8 @@ ISO 9660 file system.
.El
.It Fl x
Exclude file system nodes not explicitly listed in the specfile.
+.It Fl Z
+Create the image as a sparse file.
.El
.Pp
Where sizes are specified, a decimal number of bytes is expected.
10 usr.sbin/makefs/makefs.c
View
@@ -113,7 +113,7 @@ main(int argc, char *argv[])
start_time.tv_sec = start.tv_sec;
start_time.tv_nsec = start.tv_usec * 1000;
- while ((ch = getopt(argc, argv, "B:b:Dd:f:F:M:m:N:o:ps:S:t:x")) != -1) {
+ while ((ch = getopt(argc, argv, "B:b:Dd:f:F:M:m:N:o:ps:S:t:xZ")) != -1) {
switch (ch) {
case 'B':
@@ -205,6 +205,7 @@ main(int argc, char *argv[])
break;
}
case 'p':
+ /* Deprecated in favor of 'Z' */
fsoptions.sparse = 1;
break;
@@ -233,6 +234,11 @@ main(int argc, char *argv[])
fsoptions.onlyspec = 1;
break;
+ case 'Z':
+ /* Superscedes 'p' for compatibility with NetBSD makefs(8) */
+ fsoptions.sparse = 1;
+ break;
+
case '?':
default:
usage();
@@ -354,7 +360,7 @@ usage(void)
fprintf(stderr,
"usage: %s [-t fs-type] [-o fs-options] [-d debug-mask] [-B endian]\n"
"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-s image-size]\n"
-"\t[-b free-blocks] [-f free-files] [-F mtree-specfile] [-px]\n"
+"\t[-b free-blocks] [-f free-files] [-F mtree-specfile] [-xZ]\n"
"\t[-N userdb-dir] image-file directory | manifest [extra-directory ...]\n",
prog);
exit(1);
Please sign in to comment.
Something went wrong with that request. Please try again.