Date: Sun, 30 Nov 2014 06:08:23 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275300 - projects/building-blocks/etc/rc.d Message-ID: <201411300608.sAU68NZN064945@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Nov 30 06:08:22 2014 New Revision: 275300 URL: https://svnweb.freebsd.org/changeset/base/275300 Log: Fill in MK_ACPI, (MK_ACPI && MK_APM), MK_INET6, MK_PPP, and MK_ROUTED Rework script dependencies to allow everything made optional to more optional Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/etc/rc.d/NETWORKING projects/building-blocks/etc/rc.d/bridge projects/building-blocks/etc/rc.d/defaultroute projects/building-blocks/etc/rc.d/gssd 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/nsswitch projects/building-blocks/etc/rc.d/ppp projects/building-blocks/etc/rc.d/resolv projects/building-blocks/etc/rc.d/route6d projects/building-blocks/etc/rc.d/routed projects/building-blocks/etc/rc.d/routing projects/building-blocks/etc/rc.d/static_arp projects/building-blocks/etc/rc.d/static_ndp projects/building-blocks/etc/rc.d/stf Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 06:08:22 2014 (r275300) @@ -40,7 +40,6 @@ FILES= DAEMON \ hostid_save \ hostname \ ${_inetd} \ - ip6addrctl \ ipfilter \ ipfs \ ipfw \ @@ -65,8 +64,6 @@ FILES= DAEMON \ mdconfig \ mdconfig2 \ mountd \ - mroute6d \ - mrouted \ msgs \ natd \ netif \ @@ -82,34 +79,21 @@ FILES= DAEMON \ pf \ pflog \ pfsync \ - powerd \ - power_profile \ - ppp \ - pppoed \ pwcheck \ quota \ random \ rarpd \ rctl \ resolv \ - rfcomm_pppd_server \ root \ - route6d \ - routed \ routing \ rpcbind \ - rtadvd \ - rtsold \ savecore \ - sdpd \ securelevel \ serial \ - sppp \ ${_sshd} \ statd \ static_arp \ - static_ndp \ - stf \ swap \ swaplate \ sysctl \ @@ -132,6 +116,14 @@ FILES= DAEMON \ FILES+= accounting .endif +.if ${MK_ACPI} != "no" +FILES+= power_profile +.endif + +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" +FILES+= powerd +.endif + .if ${MK_AMD} != "no" FILES+= amd .endif @@ -162,6 +154,8 @@ FILES+= autounmountd _bluetooth= bluetooth _bthidd= bthidd _hcsecd= hcsecd +FILES+= rfcomm_pppd_server +FILES+= sdpd _ubthidhci= ubthidhci .endif @@ -197,6 +191,16 @@ FILES+= hastd _inetd= inetd .endif +.if ${MK_INET6} != "no" +FILES+= ip6addrctl +FILES+= mroute6d +FILES+= route6d +FILES+= stf +FILES+= rtadvd +FILES+= rtsold +FILES+= static_ndp +.endif + .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid @@ -259,10 +263,20 @@ _sshd= sshd FILES+= ftp-proxy .endif +.if ${MK_PPP} != "no" +FILES+= ppp +FILES+= pppoed +FILES+= sppp +.endif + .if ${MK_RCMDS} != "no" FILES+= rwho .endif +.if ${MK_ROUTED} != "no" +FILES+= routed +.endif + .if ${MK_SENDMAIL} != "no" FILES+= sendmail .endif Modified: projects/building-blocks/etc/rc.d/NETWORKING ============================================================================== --- projects/building-blocks/etc/rc.d/NETWORKING Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/NETWORKING Sun Nov 30 06:08:22 2014 (r275300) @@ -4,9 +4,9 @@ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: netif netoptions routing ppp ipfw stf -# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge -# REQUIRE: static_arp static_ndp +# REQUIRE: netif netoptions routing ipfw +# REQUIRE: defaultroute resolv bridge +# REQUIRE: static_arp # This is a dummy dependency, for services which require networking # to be operational before starting. Modified: projects/building-blocks/etc/rc.d/bridge ============================================================================== --- projects/building-blocks/etc/rc.d/bridge Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/bridge Sun Nov 30 06:08:22 2014 (r275300) @@ -26,7 +26,7 @@ # # PROVIDE: bridge -# REQUIRE: netif ppp stf +# REQUIRE: netif # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/defaultroute ============================================================================== --- projects/building-blocks/etc/rc.d/defaultroute Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/defaultroute Sun Nov 30 06:08:22 2014 (r275300) @@ -6,7 +6,7 @@ # # PROVIDE: defaultroute -# REQUIRE: devd netif stf +# REQUIRE: devd netif # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/gssd ============================================================================== --- projects/building-blocks/etc/rc.d/gssd Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/gssd Sun Nov 30 06:08:22 2014 (r275300) @@ -5,7 +5,7 @@ # PROVIDE: gssd # REQUIRE: root -# BEFORE: nfsd +# BEFORE: nfsd nfsuserd # KEYWORD: nojail shutdown . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/ipfw ============================================================================== --- projects/building-blocks/etc/rc.d/ipfw Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/ipfw Sun Nov 30 06:08:22 2014 (r275300) @@ -4,7 +4,6 @@ # # PROVIDE: ipfw -# REQUIRE: ppp # 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 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/local_unbound Sun Nov 30 06:08:22 2014 (r275300) @@ -4,7 +4,7 @@ # # PROVIDE: local_unbound -# REQUIRE: FILESYSTEMS netif resolv +# REQUIRE: FILESYSTEMS netif resolv routing # BEFORE: NETWORKING # KEYWORD: shutdown Modified: projects/building-blocks/etc/rc.d/netif ============================================================================== --- projects/building-blocks/etc/rc.d/netif Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/netif Sun Nov 30 06:08:22 2014 (r275300) @@ -26,7 +26,7 @@ # # PROVIDE: netif -# REQUIRE: FILESYSTEMS serial sppp sysctl +# REQUIRE: FILESYSTEMS serial sysctl # REQUIRE: ipfilter ipfs # KEYWORD: nojailvnet Modified: projects/building-blocks/etc/rc.d/nsswitch ============================================================================== --- projects/building-blocks/etc/rc.d/nsswitch Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/nsswitch Sun Nov 30 06:08:22 2014 (r275300) @@ -27,7 +27,7 @@ # # PROVIDE: nsswitch -# REQUIRE: root +# REQUIRE: root routing # BEFORE: NETWORK . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/ppp ============================================================================== --- projects/building-blocks/etc/rc.d/ppp Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/ppp Sun Nov 30 06:08:22 2014 (r275300) @@ -5,6 +5,7 @@ # PROVIDE: ppp # REQUIRE: netif +# BEFORE: bridge ipfw routing # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/resolv ============================================================================== --- projects/building-blocks/etc/rc.d/resolv Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/resolv Sun Nov 30 06:08:22 2014 (r275300) @@ -28,7 +28,7 @@ # # PROVIDE: resolv -# REQUIRE: netif FILESYSTEMS +# REQUIRE: netif FILESYSTEMS routing # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/route6d ============================================================================== --- projects/building-blocks/etc/rc.d/route6d Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/route6d Sun Nov 30 06:08:22 2014 (r275300) @@ -4,7 +4,8 @@ # # PROVIDE: route6d -# REQUIRE: netif routing +# REQUIRE: bridge netif routing +# BEFORE: NETWORKING # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/routed ============================================================================== --- projects/building-blocks/etc/rc.d/routed Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/routed Sun Nov 30 06:08:22 2014 (r275300) @@ -4,7 +4,8 @@ # # PROVIDE: routed -# REQUIRE: netif routing +# REQUIRE: bridge netif routing +# BEFORE: NETWORKING # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/routing ============================================================================== --- projects/building-blocks/etc/rc.d/routing Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/routing Sun Nov 30 06:08:22 2014 (r275300) @@ -6,7 +6,7 @@ # # PROVIDE: routing -# REQUIRE: netif ppp stf +# REQUIRE: netif # KEYWORD: nojailvnet . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/static_arp ============================================================================== --- projects/building-blocks/etc/rc.d/static_arp Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/static_arp Sun Nov 30 06:08:22 2014 (r275300) @@ -30,7 +30,7 @@ # # PROVIDE: static_arp -# REQUIRE: netif +# REQUIRE: netif routing # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/static_ndp ============================================================================== --- projects/building-blocks/etc/rc.d/static_ndp Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/static_ndp Sun Nov 30 06:08:22 2014 (r275300) @@ -30,7 +30,8 @@ # # PROVIDE: static_ndp -# REQUIRE: netif +# REQUIRE: netif routing +# BEFORE: NETWORKING # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/stf ============================================================================== --- projects/building-blocks/etc/rc.d/stf Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/stf Sun Nov 30 06:08:22 2014 (r275300) @@ -4,6 +4,7 @@ # PROVIDE: stf # REQUIRE: netif +# BEFORE: bridge defaultroute NETWORKING routing # KEYWORD: nojail . /etc/rc.subr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411300608.sAU68NZN064945>