From owner-svn-src-head@freebsd.org  Mon Nov  9 23:37:02 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0735A2AB55;
 Mon,  9 Nov 2015 23:37:02 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5E40614E4;
 Mon,  9 Nov 2015 23:37:02 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA9Nb1PQ086125;
 Mon, 9 Nov 2015 23:37:01 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA9Nb19I086123;
 Mon, 9 Nov 2015 23:37:01 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201511092337.tA9Nb19I086123@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 9 Nov 2015 23:37:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290628 - in head/etc: . rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2015 23:37:02 -0000

Author: bdrewery
Date: Mon Nov  9 23:37:01 2015
New Revision: 290628
URL: https://svnweb.freebsd.org/changeset/base/290628

Log:
  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

Modified:
  head/etc/Makefile
  head/etc/rc.d/var

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Mon Nov  9 23:36:57 2015	(r290627)
+++ head/etc/Makefile	Mon Nov  9 23:37:01 2015	(r290628)
@@ -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}; \

Modified: head/etc/rc.d/var
==============================================================================
--- head/etc/rc.d/var	Mon Nov  9 23:36:57 2015	(r290627)
+++ head/etc/rc.d/var	Mon Nov  9 23:37:01 2015	(r290628)
@@ -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
 }