Respect NO_FSCHG for extracting mtrees.
PR: 194189 X-MFC-With: r290628 MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
799f0b4670
commit
15482f3f96
10
etc/Makefile
10
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}; \
|
||||
|
Loading…
Reference in New Issue
Block a user