summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2014-03-01 13:00:40 +0000
committertijl <tijl@FreeBSD.org>2014-03-01 13:00:40 +0000
commitbcdab2824def211105791c904ce55ea4bbc9b6fc (patch)
treeab83ea7634769aba960e074f4c65f89cf24f1bac
parent404898ccc4c675952521cd12b1fd27efe0f07cf7 (diff)
downloadFreeBSD-src-bcdab2824def211105791c904ce55ea4bbc9b6fc.zip
FreeBSD-src-bcdab2824def211105791c904ce55ea4bbc9b6fc.tar.gz
Revert r262648 to stop severe tinderbox spamming on stable@.
-rw-r--r--usr.sbin/mtree/Makefile2
-rw-r--r--usr.sbin/mtree/mtree.5 (renamed from usr.sbin/nmtree/mtree.5)7
-rw-r--r--usr.sbin/nmtree/Makefile4
3 files changed, 10 insertions, 3 deletions
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 41f3e8f..c378455 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
+MAN= fmtree.8 mtree.5
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/mtree.5 b/usr.sbin/mtree/mtree.5
index afcdae8..92bf3f8 100644
--- a/usr.sbin/nmtree/mtree.5
+++ b/usr.sbin/mtree/mtree.5
@@ -259,6 +259,13 @@ 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.
diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile
index 7734c5a..138e28d 100644
--- a/usr.sbin/nmtree/Makefile
+++ b/usr.sbin/nmtree/Makefile
@@ -4,8 +4,8 @@
.PATH: ${.CURDIR}/../../contrib/mtree
-PROG= mtree
-MAN= mtree.5 mtree.8
+PROG= nmtree
+MAN= nmtree.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
OpenPOWER on IntegriCloud