svn commit: r290180 - head/usr.sbin/makefs

[Garrett Cooper]

Author: ngie
Date: Fri Oct 30 05:55:56 2015
New Revision: 290180
URL: https://svnweb.freebsd.org/changeset/base/290180

Log:
  Follow up to roundup feature addition in r289203
  
  - Rename -r to -R to avoid the clash with makefs -r in NetBSD
  - Note that -R is an FFS-specific option because it's not implemented
    in cd9660 today
  - Rename the roundup variable to "roundup-size" in the manpage and help
    text for consistency with other variables.
  - Bump .Dd (missed in r289203)
  
  PR: 203707
  MFC after: 1 week
  X-MFC with: r289203
  Differential Revision: https://reviews.freebsd.org/D3959
  Reviewed by: adrian (earlier patch), emaste
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/makefs/makefs.8
  head/usr.sbin/makefs/makefs.c

Modified: head/usr.sbin/makefs/makefs.8
==============================================================================
--- head/usr.sbin/makefs/makefs.8	Fri Oct 30 05:50:05 2015	(r290179)
+++ head/usr.sbin/makefs/makefs.8	Fri Oct 30 05:55:56 2015	(r290180)
@@ -35,7 +35,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 16, 2013
+.Dd October 29, 2015
 .Dt MAKEFS 8
 .Os
 .Sh NAME
@@ -53,7 +53,7 @@
 .Op Fl m Ar maximum-size
 .Op Fl N Ar userdb-dir
 .Op Fl o Ar fs-options
-.Op Fl r Ar roundup
+.Op Fl R Ar roundup-size
 .Op Fl S Ar sector-size
 .Op Fl s Ar image-size
 .Op Fl t Ar fs-type
@@ -196,9 +196,14 @@ Deprecated.
 See the
 .Fl Z
 flag.
-.It Fl r Ar roundup
-Round the image up to specified block size that should be multiple
-of block size.
+.It Fl R Ar roundup-size
+Round the image up to
+.Ar roundup-size .
+.Ar roundup-size
+should be a multiple of the file system block size.
+This option only applies to the
+.Sy ffs
+file system type.
 .It Fl S Ar sector-size
 Set the file system sector size to
 .Ar sector-size .

Modified: head/usr.sbin/makefs/makefs.c
==============================================================================
--- head/usr.sbin/makefs/makefs.c	Fri Oct 30 05:50:05 2015	(r290179)
+++ head/usr.sbin/makefs/makefs.c	Fri Oct 30 05:55:56 2015	(r290180)
@@ -209,10 +209,10 @@ main(int argc, char *argv[])
 			fsoptions.sparse = 1;
 			break;
 
-		case 'r':
+		case 'R':
 			/* Round image size up to specified block size */
 			fsoptions.roundup =
-			    strsuftoll("roundup", optarg, 0, LLONG_MAX);
+			    strsuftoll("roundup-size", optarg, 0, LLONG_MAX);
 			break;
 
 		case 's':
@@ -365,7 +365,7 @@ usage(void)
 	prog = getprogname();
 	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] [-r roundup ]\n"
+"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-R roundup-size]\n"
 "\t[-s image-size] [-b free-blocks] [-f free-files] [-F mtree-specfile]\n"
 "\t[-xZ] [-N userdb-dir] image-file directory | manifest [extra-directory ...]\n",
 	    prog);