Re: svn commit: r290628 - in head/etc: . rc.d

2015-11-12 Thread Craig Rodrigues 
On Mon, Nov 9, 2015 at 3:37 PM, Bryan Drewery  wrote:

>
>   When extracting mtrees, pass -i so schg/sappnd are respected.
>
>
However, if NO_FSCHG is specified in make.conf, this does not do the right
thing.

--
Craig
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290628 - in head/etc: . rc.d

2015-11-12 Thread Craig Rodrigues 
On Thu, Nov 12, 2015 at 9:11 AM, Bryan Drewery  wrote:

> On 11/12/2015 6:42 AM, Craig Rodrigues wrote:
> > However, if NO_FSCHG is specified in make.conf, this does not do the
> > right thing.
> >
>
> This is now fixed.
>

Thank you.

--
Craig
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290628 - in head/etc: . rc.d

2015-11-12 Thread Bryan Drewery 
On 11/12/2015 6:42 AM, Craig Rodrigues wrote:
> 
> 
> On Mon, Nov 9, 2015 at 3:37 PM, Bryan Drewery  > wrote:
> 
> 
>   When extracting mtrees, pass -i so schg/sappnd are respected.
> 
> 
> However, if NO_FSCHG is specified in make.conf, this does not do the
> right thing.
> 

This is now fixed.


-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r290628 - in head/etc: . rc.d

2015-11-12 Thread Bryan Drewery 


> On Nov 12, 2015, at 06:42, Craig Rodrigues  wrote:
> 
> 
> 
>> On Mon, Nov 9, 2015 at 3:37 PM, Bryan Drewery  wrote:
>> 
>>   When extracting mtrees, pass -i so schg/sappnd are respected.
> 
> However, if NO_FSCHG is specified in make.conf, this does not do the right 
> thing.
> 
> 

I'm not sure if that ever worked, but I agree it should. I'll fix it.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290628 - in head/etc: . rc.d

2015-11-09 Thread Bryan Drewery 
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: guy...@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
 }
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"