diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-11-09 23:37:01 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-11-09 23:37:01 +0000 |
| commit | 6b877e2ca0be7b39525d8cc09b859f4ebe225a99 (patch) | |
| tree | aefe7eceb5707ccb123cdaaad704eed0791ddb6c | |
| parent | 264ecbcdcde616242a571d8713157ea0efd91e5a (diff) | |
| download | FreeBSD-src-6b877e2ca0be7b39525d8cc09b859f4ebe225a99.zip FreeBSD-src-6b877e2ca0be7b39525d8cc09b859f4ebe225a99.tar.gz | |
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
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rwxr-xr-x | etc/rc.d/var | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index 5f8d9ab..c8a1232 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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}; \ diff --git a/etc/rc.d/var b/etc/rc.d/var index 2be2484..b80fcb0 100755 --- a/etc/rc.d/var +++ b/etc/rc.d/var @@ -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 } |
