svn commit: r290718 - head/etc

[Bryan Drewery]

Author: bdrewery
Date: Thu Nov 12 17:11:03 2015
New Revision: 290718
URL: https://svnweb.freebsd.org/changeset/base/290718

Log:
  Respect NO_FSCHG for extracting mtrees.
  
  PR:		194189
  X-MFC-With:	r290628
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Thu Nov 12 16:08:49 2015	(r290717)
+++ head/etc/Makefile	Thu Nov 12 17:11:03 2015	(r290718)
@@ -338,6 +338,9 @@ MTREE_FILTER= sed -e 's,\([gu]\)name=,\1
 .else
 MTREE_FILTER= cat
 .endif
+.if !defined(NO_FSCHG)
+MTREE_FSCHG=	-i
+.endif
 
 MTREES=		mtree/BSD.root.dist		/		\
 		mtree/BSD.var.dist		/var		\
@@ -370,10 +373,11 @@ distrib-dirs: ${MTREES:N/*}
 		d=${DESTDIR}$$1; \
 		shift; \
 		test -d $$d || mkdir -p $$d; \
-		${ECHO} ${MTREE_CMD} -deiU ${MTREE_FOLLOWS_SYMLINKS} \
-		    -f $$m -p $$d; \
+		${ECHO} ${MTREE_CMD} -deU ${MTREE_FSCHG} \
+		    ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
 		${MTREE_FILTER} $$m | \
-		${MTREE_CMD} -deiU ${MTREE_FOLLOWS_SYMLINKS} -p $$d; \
+		${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \
+		    -p $$d; \
 	done; true
 .if defined(NO_ROOT)
 	@set ${MTREES}; \