Date: Mon, 9 Nov 2015 23:37:01 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290628 - in head/etc: . rc.d Message-ID: <201511092337.tA9Nb19I086123@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Mon Nov 9 23:37:01 2015 New Revision: 290628 URL: https://svnweb.freebsd.org/changeset/base/290628 Log: 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 Modified: head/etc/Makefile head/etc/rc.d/var Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Mon Nov 9 23:36:57 2015 (r290627) +++ head/etc/Makefile Mon Nov 9 23:37:01 2015 (r290628) @@ -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}; \ Modified: head/etc/rc.d/var ============================================================================== --- head/etc/rc.d/var Mon Nov 9 23:36:57 2015 (r290627) +++ head/etc/rc.d/var Mon Nov 9 23:37:01 2015 (r290628) @@ -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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511092337.tA9Nb19I086123>