diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2007-05-19 20:12:51 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2007-05-19 20:12:51 +0000 |
| commit | d1d03717316dca4efc8d465aadf2eeffe03143ef (patch) | |
| tree | 94ae4e04b827eeb4c1686310b82416ace311b834 /sbin/newfs/newfs.c | |
| parent | 258e99dd6167909ae0237a8eb4614f17bdaf6a4c (diff) | |
Now that the amd64 floppy and cd image -c setting have been fixed,
recommit the -c changes. For now, we warn only if we cannot honour -c.
ok millert@ deraadt@
Diffstat (limited to 'sbin/newfs/newfs.c')
| -rw-r--r-- | sbin/newfs/newfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 91c6827c774..8856ba4b726 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.62 2007/05/19 01:28:15 deraadt Exp $ */ +/* $OpenBSD: newfs.c,v 1.63 2007/05/19 20:12:50 otto Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -116,7 +116,7 @@ int sectorsize; /* bytes/sector */ int realsectorsize; /* bytes/sector in hardware */ int fsize = 0; /* fragment size */ int bsize = 0; /* block size */ -int maxblkspercg = INT_MAX; /* maximum blocks per cylinder group */ +int maxfrgspercg = INT_MAX; /* maximum fragments per cylinder group */ int minfree = MINFREE; /* free space threshold */ int opt = DEFAULTOPT; /* optimization preference (space or time) */ int reqopt = -1; /* opt preference has not been specified */ @@ -205,9 +205,9 @@ main(int argc, char *argv[]) fatal("block size is %s: %s", errstr, optarg); break; case 'c': - maxblkspercg = strtonum(optarg, 1, INT_MAX, &errstr); + maxfrgspercg = strtonum(optarg, 1, INT_MAX, &errstr); if (errstr) - fatal("blocks per cylinder group is %s: %s", + fatal("fragments per cylinder group is %s: %s", errstr, optarg); break; case 'e': @@ -668,7 +668,7 @@ usage(void) } else { fprintf(stderr, "usage: %s [-Nq] [-b block-size] " - "[-c blocks-per-cylinder-group] [-e maxbpg]\n" + "[-c fragments-per-cylinder-group] [-e maxbpg]\n" "\t[-f frag-size] [-g avgfilesize] [-h avgfpdir] [-i bytes]\n" "\t[-m free-space] [-O filesystem-format] [-o optimization]\n" "\t[-S sector-size] [-s size] [-t fstype] special\n", |