Date: Tue, 03 Sep 2019 14:08:18 -0000 From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r346592 - stable/11/etc/rc.d Message-ID: <201904230406.x3N46Q5V079499@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904230406.x3N46Q5V079499>