From 6662a8e56b3f21d76f8665d0c5388d46e9e9e6b3 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 9 Nov 2015 23:37:01 +0000
Subject: [PATCH] When extracting mtrees, pass -i so schg/sappnd are respected.

This fixes /var/empty not being schg in the installation.

This was a change from fmtree to nmtree, that -i is now required to
apply these flags.

PR:		194189
Submitted by:	guyyur@gmail.com
MFC after:	2 weeks
Relnotes:	yes
---
 etc/Makefile | 4 ++--
 etc/rc.d/var | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index 5f8d9ab5cbcc..c8a1232662ff 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -370,10 +370,10 @@ distrib-dirs: ${MTREES:N/*}
 		d=${DESTDIR}$$1; \
 		shift; \
 		test -d $$d || mkdir -p $$d; \
-		${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \
+		${ECHO} ${MTREE_CMD} -deiU ${MTREE_FOLLOWS_SYMLINKS} \
 		    -f $$m -p $$d; \
 		${MTREE_FILTER} $$m | \
-		${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -p $$d; \
+		${MTREE_CMD} -deiU ${MTREE_FOLLOWS_SYMLINKS} -p $$d; \
 	done; true
 .if defined(NO_ROOT)
 	@set ${MTREES}; \
diff --git a/etc/rc.d/var b/etc/rc.d/var
index 2be24842bd0d..b80fcb05d7fd 100755
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -41,12 +41,12 @@ load_rc_config $name
 
 populate_var()
 {
-	/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var > /dev/null
+	/usr/sbin/mtree -deiU -f /etc/mtree/BSD.var.dist -p /var > /dev/null
 	case ${sendmail_enable} in
 	[Nn][Oo][Nn][Ee])
 		;;
 	*)
-		/usr/sbin/mtree -deU -f /etc/mtree/BSD.sendmail.dist -p / > /dev/null
+		/usr/sbin/mtree -deiU -f /etc/mtree/BSD.sendmail.dist -p / > /dev/null
 		;;
 	esac
 }