diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-12 17:11:03 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-12 17:11:03 +0000 |
| commit | 15482f3f967a3a612ef86be1ca52c0ee258350e7 (patch) | |
| tree | 58487aa30ab04e5693e16aaefb8f634a42ed9b7d | |
| parent | 799f0b46702f0c7c0fb1798907ba84acc7940db3 (diff) | |
| download | src-15482f3f967a3a612ef86be1ca52c0ee258350e7.tar.gz src-15482f3f967a3a612ef86be1ca52c0ee258350e7.zip | |
Respect NO_FSCHG for extracting mtrees.
PR: 194189
X-MFC-With: r290628
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=290718
| -rw-r--r-- | etc/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile index c8a1232662ff..7340a35a5fad 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -338,6 +338,9 @@ MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \ .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}; \ |