diff options
author | brooks <brooks@FreeBSD.org> | 2014-03-01 03:39:56 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2014-03-01 03:39:56 +0000 |
commit | 1135c91d00efe0ccd2baec70e62034511c5310f8 (patch) | |
tree | f402389dec03beb4a3206bfe366ecf3b1ba98c06 /usr.sbin | |
parent | d929cfecd8c2b0d3be62b727851c914088ea8977 (diff) | |
download | FreeBSD-src-1135c91d00efe0ccd2baec70e62034511c5310f8.zip FreeBSD-src-1135c91d00efe0ccd2baec70e62034511c5310f8.tar.gz |
MFC: 261298
Merge from CheriBSD:
commit 70b8f0c127db6b80411789d237b403cc64a93573
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date: Mon Jan 27 22:53:57 2014 +0000
Move mtree.5 to usr.sbin/nmtree.
Remove note that mtree 2.0 format files aren't supported.
Sponsored by: DARPA, AFRL
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/mtree/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/nmtree/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/nmtree/mtree.5 (renamed from usr.sbin/mtree/mtree.5) | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile index c378455..41f3e8f 100644 --- a/usr.sbin/mtree/Makefile +++ b/usr.sbin/mtree/Makefile @@ -6,7 +6,7 @@ .PATH: ${.CURDIR}/../../usr.bin/cksum PROG= fmtree -MAN= fmtree.8 mtree.5 +MAN= fmtree.8 SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c SRCS+= specspec.c diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile index 138e28d..7734c5a 100644 --- a/usr.sbin/nmtree/Makefile +++ b/usr.sbin/nmtree/Makefile @@ -4,8 +4,8 @@ .PATH: ${.CURDIR}/../../contrib/mtree -PROG= nmtree -MAN= nmtree.8 +PROG= mtree +MAN= mtree.5 mtree.8 SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ only.c spec.c specspec.c verify.c LDADD+= -lmd -lutil diff --git a/usr.sbin/mtree/mtree.5 b/usr.sbin/nmtree/mtree.5 index 92bf3f8..afcdae8 100644 --- a/usr.sbin/mtree/mtree.5 +++ b/usr.sbin/nmtree/mtree.5 @@ -259,13 +259,6 @@ The entry format was added by .Nx . .Sh BUGS -The -.Fx -implementation of mtree does not currently support -the -.Nm -2.0 -format. The requirement for a .Dq #mtree signature line is new and not yet widely implemented. |