diff options
author | ngie <ngie@FreeBSD.org> | 2015-03-24 07:43:58 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-03-24 07:43:58 +0000 |
commit | 487f2aaa14e3d6826efd2aa28d38382744ab9828 (patch) | |
tree | 116bfa8d2ba29d305bae0c7ac944f9b3c6694744 /etc | |
parent | 13f1d2fd15423d21f6f48eee89b407607aecb6c2 (diff) | |
download | FreeBSD-src-487f2aaa14e3d6826efd2aa28d38382744ab9828.zip FreeBSD-src-487f2aaa14e3d6826efd2aa28d38382744ab9828.tar.gz |
MFC r271893,r271895,r272043,r278249,r278282,r278466:
r271893:
Don't install /etc/rc.d/rwho unless MK_RCMDS == yes
Sponsored by: EMC / Isilon Storage Division
r271895:
Don't install /etc/rc.d/ftp-proxy unless MK_PF == yes
Sponsored by: EMC / Isilon Storage Division
r272043:
Don't install /etc/rc.d/keyserv unless MK_OPENSSL == yes
Sponsored by: EMC / Isilon Storage Division
r278249:
Honor the following flags with the following rc.d scripts for services that can
be easily decoupled from the boot process without disrupting other services
- MK_APM && MK_ACPI: powerd
- MK_BOOTPARAMD: bootparams
- MK_FTP: ftpd
- MK_INETD: inetd
- MK_LEGACY_CONSOLE: moused, syscons
- MK_MAIL: othermta
- MK_NS_CACHING: nscd
- MK_NTP: ntpd (ntpdate is required by other services and can't be easily
conditionalized -- yet..)
- MK_ROUTED: routed
- MK_SENDMAIL: sendmail
- MK_TIMED: timed
- MK_VI: virecover
Sponsored by: EMC / Isilon Storage Division
r278282:
Use FILES+= idiom instead of _inetd when referencing inetd rc.d script
This was a discrepancy between ^/projects/building-blocks and ^/head that I
didn't resolve before committing the change to ^/head
Pointyhat to: me
Reported by: jhb
Sponsored by: EMC / Isilon Storage Division
r278466:
Remove explicit routing/sendmail rc.d inclusion in FILES
Reported by: Guy Yur <guyyur@gmail.com>
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'etc')
-rw-r--r-- | etc/rc.d/Makefile | 67 |
1 files changed, 53 insertions, 14 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index fe6c664..5688da3 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -18,7 +18,6 @@ FILES= DAEMON \ auditdistd \ bgfsck \ ${_bluetooth} \ - bootparams \ bridge \ ${_bthidd} \ cleanvar \ @@ -34,8 +33,6 @@ FILES= DAEMON \ dumpon \ faith \ fsck \ - ftp-proxy \ - ftpd \ gbde \ geli \ geli2 \ @@ -45,7 +42,6 @@ FILES= DAEMON \ hostid \ hostid_save \ hostname \ - inetd \ initrandom \ ip6addrctl \ ipfilter \ @@ -57,7 +53,6 @@ FILES= DAEMON \ ${_ipxrouted} \ ${_kadmind} \ ${_kdc} \ - keyserv \ ${_kfd} \ kld \ kldxref \ @@ -74,7 +69,6 @@ FILES= DAEMON \ mdconfig \ mdconfig2 \ mountd \ - moused \ mroute6d \ mrouted \ msgs \ @@ -90,15 +84,12 @@ FILES= DAEMON \ nisdomain \ ${_nscd} \ nsswitch \ - ntpd \ ntpdate \ ${_opensm} \ - othermta \ pf \ pflog \ pfsync \ postrandom \ - powerd \ ppp \ pppoed \ pwcheck \ @@ -110,16 +101,13 @@ FILES= DAEMON \ rfcomm_pppd_server \ root \ route6d \ - routed \ routing \ rpcbind \ rtadvd \ rtsold \ - rwho \ savecore \ sdpd \ securelevel \ - sendmail \ serial \ sppp \ ${_sshd} \ @@ -129,10 +117,8 @@ FILES= DAEMON \ stf \ swap \ swaplate \ - syscons \ sysctl \ syslogd \ - timed \ tmp \ ${_ubthidhci} \ ugidfw \ @@ -158,6 +144,10 @@ FILES+= accounting FILES+= power_profile .endif +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" +FILES+= powerd +.endif + .if ${MK_AMD} != "no" FILES+= amd .endif @@ -180,6 +170,10 @@ _hcsecd= hcsecd _ubthidhci= ubthidhci .endif +.if ${MK_BOOTPARAMD} != "no" +FILES+= bootparams +.endif + .if ${MK_BSNMP} != "no" FILES+= bsnmpd .endif @@ -188,6 +182,10 @@ FILES+= bsnmpd FILES+= ccd .endif +.if ${MK_FTP} != "no" +FILES+= ftpd +.endif + .if ${MK_HAST} != "no" FILES+= hastd .endif @@ -196,6 +194,10 @@ FILES+= hastd _ipxrouted= ipxrouted .endif +.if ${MK_INETD} != "no" +FILES+= inetd +.endif + .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid @@ -214,22 +216,59 @@ _kfd= kfd _kpasswdd= kpasswdd .endif +.if ${MK_LEGACY_CONSOLE} != "no" +FILES+= moused +FILES+= syscons +.endif + .if ${MK_LPR} != "no" FILES+= lpd .endif +.if ${MK_MAIL} != "no" +FILES+= othermta +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif +.if ${MK_NTP} != "no" +FILES+= ntpd +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif +.if ${MK_OPENSSL} != "no" +FILES+= keyserv +.endif + .if ${MK_OPENSSH} != "no" _sshd= sshd .endif +.if ${MK_PF} != "no" +FILES+= ftp-proxy +.endif + +.if ${MK_RCMDS} != "no" +FILES+= rwho +.endif + +.if ${MK_ROUTED} != "no" +FILES+= routed +.endif + +.if ${MK_SENDMAIL} != "no" +FILES+= sendmail +.endif + +.if ${MK_TIMED} != "no" +FILES+= timed +.endif + .if ${MK_UNBOUND} != "no" _unbound= local_unbound .endif |