diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.sbin/makefs | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'usr.sbin/makefs')
| -rw-r--r-- | usr.sbin/makefs/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/makefs/ffs.c | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile index 6253148..882fe45 100644 --- a/usr.sbin/makefs/Makefile +++ b/usr.sbin/makefs/Makefile @@ -30,12 +30,6 @@ SRCS+= pack_dev.c SRCS+= ffs_tables.c CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd -LIBNETBSDDIR= ${.OBJDIR}/../../lib/libnetbsd -LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a -DPADD+= ${LIBNETBSD} -LDADD+= ${LIBNETBSD} - -DPADD+= ${LIBSBUF} ${LIBUTIL} -LDADD+= -lsbuf -lutil +LIBADD= netbsd util sbuf .include <bsd.prog.mk> diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 9fd87ae..1647d8f 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -191,7 +191,7 @@ ffs_parse_opts(const char *option, fsinfo_t *fsopts) "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" }, |
