svn commit: r348098 - in head: etc libexec/rc

[Emmanuel Vadot]

Author: manu
Date: Wed May 22 07:21:05 2019
New Revision: 348098
URL: https://svnweb.freebsd.org/changeset/base/348098

Log:
  pkgbase: Move rc.firewall to libexec/rc
  
  Put it with all the other rc files
  
  Reviewed by:	bapt

Modified:
  head/etc/Makefile
  head/libexec/rc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Wed May 22 06:02:51 2019	(r348097)
+++ head/etc/Makefile	Wed May 22 07:21:05 2019	(r348098)
@@ -17,7 +17,6 @@ SUBDIR+=sendmail
 BIN1=	\
 	login.access \
 	rc.bsdextended \
-	rc.firewall \
 	termcap.small
 
 # NB: keep these sorted by MK_* knobs

Modified: head/libexec/rc/Makefile
==============================================================================
--- head/libexec/rc/Makefile	Wed May 22 06:02:51 2019	(r348097)
+++ head/libexec/rc/Makefile	Wed May 22 07:21:05 2019	(r348098)
@@ -1,8 +1,13 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 CONFGROUPS=	CONFETC CONFETCEXEC CONFETCDEFAULTS
 CONFETCDIR=	/etc
 CONFETC=	network.subr rc rc.initdiskless rc.subr rc.shutdown
+.if ${MK_IPFW} != "no"
+CONFETC+=	rc.firewall
+.endif
 CONFETCMODE=	644
 CONFETCEXEC=	netstart pccard_ether rc.resume rc.suspend
 CONFETCEXECDIR=	/etc