diff options
| author | Martin Natano <natano@cvs.openbsd.org> | 2016-11-11 09:27:32 +0000 |
|---|---|---|
| committer | Martin Natano <natano@cvs.openbsd.org> | 2016-11-11 09:27:32 +0000 |
| commit | 5565ed564f9c0c35a7b9fb9d5bf22a7fc588aab9 (patch) | |
| tree | eac02fcb6210a81af44f46fd3bcd5b372e993635 | |
| parent | 3c8072a6ebb23550ccf7fc734d497740adbc874b (diff) | |
Optimize for space by default.
ok deraadt
| -rw-r--r-- | usr.sbin/makefs/ffs.c | 6 | ||||
| -rw-r--r-- | usr.sbin/makefs/makefs.8 | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index d8f8ac1ac05..46629c16123 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.c,v 1.24 2016/11/10 08:33:11 natano Exp $ */ +/* $OpenBSD: ffs.c,v 1.25 2016/11/11 09:27:31 natano Exp $ */ /* $NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $ */ /* @@ -151,7 +151,7 @@ ffs_prep_opts(fsinfo_t *fsopts) ffs_opts->fsize= -1; ffs_opts->density= -1; ffs_opts->minfree= -1; - ffs_opts->optimization= -1; + ffs_opts->optimization = FS_OPTSPACE; ffs_opts->maxcontig= -1; ffs_opts->maxbpg= -1; ffs_opts->avgfilesize= -1; @@ -328,8 +328,6 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts) /* fsopts->density is set below */ if (ffs_opts->minfree == -1) ffs_opts->minfree = MINFREE; - if (ffs_opts->optimization == -1) - ffs_opts->optimization = DEFAULTOPT; if (ffs_opts->maxcontig == -1) ffs_opts->maxcontig = MAX(1, MIN(MAXBSIZE, FFS_MAXBSIZE) / ffs_opts->bsize); diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index 6a635720137..586da08fb92 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: makefs.8,v 1.16 2016/11/08 19:31:52 natano Exp $ +.\" $OpenBSD: makefs.8,v 1.17 2016/11/11 09:27:31 natano Exp $ .\" $NetBSD: makefs.8,v 1.55 2015/11/25 16:32:00 wiz Exp $ .\" .\" Copyright (c) 2001-2003 Wasabi Systems, Inc. @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: November 8 2016 $ +.Dd $Mdocdate: November 11 2016 $ .Dt MAKEFS 8 .Os .Sh NAME @@ -176,6 +176,7 @@ Minimum % free. .It Sy optimization Optimization preference: one of .Ql space +(default) or .Ql time . .It Sy version |