Date: Sun, 30 Nov 2014 11:14:50 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275314 - projects/building-blocks/etc/rc.d Message-ID: <201411301114.sAUBEoaI008505@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Nov 30 11:14:49 2014 New Revision: 275314 URL: https://svnweb.freebsd.org/changeset/base/275314 Log: - Make NETWORKING depend on DNS/FIREWALL - Make local_unbound provide DNS - Make ipfs, ipfw, and pf provide FIREWALL - Make securelevel require FIREWALL - Remove ipfs/ipfilter requirement from netif to avoid circular dependency with those services Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/etc/rc.d/NETWORKING projects/building-blocks/etc/rc.d/ipfs projects/building-blocks/etc/rc.d/ipfw projects/building-blocks/etc/rc.d/local_unbound projects/building-blocks/etc/rc.d/netif projects/building-blocks/etc/rc.d/pf projects/building-blocks/etc/rc.d/securelevel Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 11:14:49 2014 (r275314) @@ -40,11 +40,6 @@ FILES= DAEMON \ hostid_save \ hostname \ ${_inetd} \ - ipfilter \ - ipfs \ - ipfw \ - ipmon \ - ipnat \ ipsec \ ${_kadmind} \ ${_kdc} \ @@ -76,9 +71,6 @@ FILES= DAEMON \ nsswitch \ ${_opensm} \ ${_othermta} \ - pf \ - pflog \ - pfsync \ pwcheck \ quota \ random \ @@ -201,6 +193,17 @@ FILES+= rtsold FILES+= static_ndp .endif +.if ${MK_IPFILTER} != "no" +FILES+= ipfilter +FILES+= ipmon +FILES+= ipnat +FILES+= ipfs +.endif + +.if ${MK_IPFW} != "no" +FILES+= ipfw +.endif + .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid @@ -242,6 +245,16 @@ FILES+= nfsd FILES+= nfsuserd .endif +.if ${MK_NIS} != "no" +FILES+= nisdomain +FILES+= ypbind +FILES+= yppasswdd +FILES+= ypserv +FILES+= ypset +FILES+= ypupdated +FILES+= ypxfrd +.endif + .if ${MK_NTP} != "no" FILES+= ntpd FILES+= ntpdate @@ -261,6 +274,9 @@ _sshd= sshd .if ${MK_PF} != "no" FILES+= ftp-proxy +FILES+= pf +FILES+= pflog +FILES+= pfsync .endif .if ${MK_PPP} != "no" Modified: projects/building-blocks/etc/rc.d/NETWORKING ============================================================================== --- projects/building-blocks/etc/rc.d/NETWORKING Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/NETWORKING Sun Nov 30 11:14:49 2014 (r275314) @@ -4,7 +4,7 @@ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: netif netoptions routing ipfw +# REQUIRE: netif netoptions routing DNS FIREWALL # REQUIRE: defaultroute resolv bridge # REQUIRE: static_arp Modified: projects/building-blocks/etc/rc.d/ipfs ============================================================================== --- projects/building-blocks/etc/rc.d/ipfs Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/ipfs Sun Nov 30 11:14:49 2014 (r275314) @@ -3,7 +3,7 @@ # $FreeBSD$ # -# PROVIDE: ipfs +# PROVIDE: ipfs FIREWALL # REQUIRE: ipnat # KEYWORD: nojail shutdown Modified: projects/building-blocks/etc/rc.d/ipfw ============================================================================== --- projects/building-blocks/etc/rc.d/ipfw Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/ipfw Sun Nov 30 11:14:49 2014 (r275314) @@ -3,7 +3,8 @@ # $FreeBSD$ # -# PROVIDE: ipfw +# PROVIDE: ipfw FIREWALL +# REQUIRE: defaultroute # KEYWORD: nojailvnet . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/local_unbound ============================================================================== --- projects/building-blocks/etc/rc.d/local_unbound Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/local_unbound Sun Nov 30 11:14:49 2014 (r275314) @@ -3,9 +3,8 @@ # $FreeBSD$ # -# PROVIDE: local_unbound +# PROVIDE: local_unbound DNS # REQUIRE: FILESYSTEMS netif resolv routing -# BEFORE: NETWORKING # KEYWORD: shutdown . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/netif ============================================================================== --- projects/building-blocks/etc/rc.d/netif Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/netif Sun Nov 30 11:14:49 2014 (r275314) @@ -27,7 +27,6 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS serial sysctl -# REQUIRE: ipfilter ipfs # KEYWORD: nojailvnet . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/pf ============================================================================== --- projects/building-blocks/etc/rc.d/pf Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/pf Sun Nov 30 11:14:49 2014 (r275314) @@ -3,7 +3,7 @@ # $FreeBSD$ # -# PROVIDE: pf +# PROVIDE: pf FIREWALL # REQUIRE: FILESYSTEMS netif pflog pfsync # BEFORE: routing # KEYWORD: nojail Modified: projects/building-blocks/etc/rc.d/securelevel ============================================================================== --- projects/building-blocks/etc/rc.d/securelevel Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/securelevel Sun Nov 30 11:14:49 2014 (r275314) @@ -4,7 +4,7 @@ # # PROVIDE: securelevel -# REQUIRE: adjkerntz ipfw ipfilter pf +# REQUIRE: adjkerntz FIREWALL . /etc/rc.subr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411301114.sAUBEoaI008505>