diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2019-03-12 19:34:33 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2019-03-12 19:34:33 +0000 |
| commit | 77e6f9282e8af62e9a630de6967e250bb7a185e6 (patch) | |
| tree | 616b653da6e07024e377f070161d0087d01eb183 | |
| parent | 22d7708455ae7dc26aed18f4f1dd2c7bbebbcc18 (diff) | |
Notes
| -rw-r--r-- | libexec/rc/rc.d/Makefile | 11 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index d8d014cb167a..3eef01e58b21 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -46,10 +46,6 @@ CONFS= DAEMON \ hostname \ iovctl \ ip6addrctl \ - ipfilter \ - ipfs \ - ipmon \ - ipnat \ ipsec \ ${_kadmind} \ ${_kdc} \ @@ -215,6 +211,13 @@ HASTPACKAGE= hast CONFS+= inetd .endif +.if ${MK_IPFILTER} != "no" +CONFS+= ipfilter \ + ipfs \ + ipmon \ + ipnat +.endif + .if ${MK_IPFW} != "no" CONFS+= ipfw .if ${MK_NETGRAPH} != "no" diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 72a938cb8765..3e51150786eb 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3127,6 +3127,10 @@ OLD_FILES+=usr/share/man/man8/inetd.8.gz .if ${MK_IPFILTER} == no OLD_FILES+=etc/periodic/security/510.ipfdenied OLD_FILES+=etc/periodic/security/610.ipf6denied +OLD_FILES+=etc/rc.d/ipfilter +OLD_FILES+=etc/rc.d/ipfs +OLD_FILES+=etc/rc.d/ipmon +OLD_FILES+=etc/rc.d/ipnat OLD_FILES+=rescue/ipf OLD_FILES+=sbin/ipf OLD_FILES+=sbin/ipfs @@ -3196,6 +3200,7 @@ OLD_FILES+=usr/share/man/man4/ipnat.4.gz OLD_FILES+=usr/share/man/man5/ipf.5.gz OLD_FILES+=usr/share/man/man5/ipf.conf.5.gz OLD_FILES+=usr/share/man/man5/ipf6.conf.5.gz +OLD_FILES+=usr/share/man/man5/ipfilter.5.gz OLD_FILES+=usr/share/man/man5/ipnat.5.gz OLD_FILES+=usr/share/man/man5/ipnat.conf.5.gz OLD_FILES+=usr/share/man/man5/ippool.5.gz |