d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When extracting mtrees, pass -i so schg/sappnd are respected.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2015-11-09 23:37:01 +00:00
parent ddd945c7b5
commit 6662a8e56b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=290628
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/Makefile
View File

@ -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}; \

4
etc/rc.d/var
View File

@ -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
}