bin/49559: makefs erroneously parses the FFS maxbpg option as maxbpf

[brueffer%FreeBSD.org@localhost]

>Number:         49559
>Category:       bin
>Synopsis:       makefs erroneously parses the FFS maxbpg option as maxbpf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bin-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 12 19:35:01 +0000 2015
>Originator:     Christian Brueffer
>Release:        CURRENT
>Organization:
>Environment:
>Description:
This problem was reported as FreeBSD bug 196598 by Dan McGregor and has been fixed in FreeBSD revision r277085.
>How-To-Repeat:
(from the original PR)

# makefs -t ffs -o version=2,maxbpg=4096 -s 4g -N etc ../rootfs METALOG
makefs: Unknown option `maxbpg'
>Fix:
This is the diff committed to FreeBSD, the NetBSD one is analogous.

Modified: head/usr.sbin/makefs/ffs.c
==============================================================================
--- head/usr.sbin/makefs/ffs.c	Mon Jan 12 18:43:34 2015	(r277084)
+++ head/usr.sbin/makefs/ffs.c	Mon Jan 12 19:26:31 2015	(r277085)
@@ -191,7 +191,7 @@ ffs_parse_opts(const char *option, fsinf
 					"bytes per inode" },
 		{ "minfree",	&ffs_opts->minfree,	0,	99,
 					"minfree" },
-		{ "maxbpf",	&ffs_opts->maxbpg,	1,	INT_MAX,
+		{ "maxbpg",	&ffs_opts->maxbpg,	1,	INT_MAX,
 					"max blocks per file in a cg" },
 		{ "avgfilesize", &ffs_opts->avgfilesize,1,	INT_MAX,
 					"expected average file size" },