svn commit: r346592 - stable/11/etc/rc.d

Cy Schubert cy at FreeBSD.org
Tue Apr 23 04:06:27 UTC 2019


Author: cy
Date: Tue Apr 23 04:06:26 2019
New Revision: 346592
URL: https://svnweb.freebsd.org/changeset/base/346592

Log:
  Fixup mismerge of r345079. CONFS in HEAD and stable/12 is FILES in
  stable/11.
  
  This is a direct commit to the stable/11 branch.
  
  Reported by:	Allendorf, Scott C <scott-allendorf at uiowa.edu>

Modified:
  stable/11/etc/rc.d/Makefile

Modified: stable/11/etc/rc.d/Makefile
==============================================================================
--- stable/11/etc/rc.d/Makefile	Tue Apr 23 03:52:43 2019	(r346591)
+++ stable/11/etc/rc.d/Makefile	Tue Apr 23 04:06:26 2019	(r346592)
@@ -211,7 +211,7 @@ FILES+=		inetd
 .endif
 
 .if ${MK_IPFILTER} != "no"
-CONFS+=	ipfilter \
+FILES+=	ipfilter \
 	ipfs \
 	ipmon \
 	ipnat


More information about the svn-src-all mailing list