summaryrefslogtreecommitdiffstats
path: root/etc/mtree
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-09-05 18:36:23 +0000
committerdim <dim@FreeBSD.org>2015-09-05 18:36:23 +0000
commitfe74670889cf92661ccb26dc6bd31e8227b41594 (patch)
treec2636bec23985b92b33023a5ca2e324f89604bfa /etc/mtree
parent3cb87c6fdcce3fa2b08afc959741598eb31a8a5c (diff)
parent127f7b062779965375aa7d373ab56614a5d13f16 (diff)
downloadFreeBSD-src-fe74670889cf92661ccb26dc6bd31e8227b41594.zip
FreeBSD-src-fe74670889cf92661ccb26dc6bd31e8227b41594.tar.gz
Merge ^/head r286858 through r287489.
Diffstat (limited to 'etc/mtree')
-rw-r--r--etc/mtree/BSD.tests.dist2
-rw-r--r--etc/mtree/BSD.usr.dist4
2 files changed, 6 insertions, 0 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index d16bb47..3d2ff51 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -574,6 +574,8 @@
usr.sbin
etcupdate
..
+ fstyp
+ ..
newsyslog
..
nmtree
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index c0a6926..f786438 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -38,6 +38,10 @@
..
i18n
..
+ libxo
+ encoder
+ ..
+ ..
..
lib32
dtrace
OpenPOWER on IntegriCloud