Author: ngie
Date: Thu Feb 5 11:38:29 2015
New Revision: 278249
URL: https://svnweb.freebsd.org/changeset/base/278249
Log:
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
MFC after: 3 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/etc/rc.d/Makefile
Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile Thu Feb 5 11:37:07 2015 (r278248)
+++ head/etc/rc.d/Makefile Thu Feb 5 11:38:29 2015 (r278249)
@@ -19,7 +19,6 @@ FILES= DAEMON \
auditdistd \
bgfsck \
${_bluetooth} \
- bootparams \
bridge \
${_bthidd} \
${_casperd} \
@@ -35,7 +34,6 @@ FILES= DAEMON \
dmesg \
dumpon \
fsck \
- ftpd \
gbde \
geli \
geli2 \
@@ -46,7 +44,6 @@ FILES= DAEMON \
hostid \
hostid_save \
hostname \
- inetd \
ip6addrctl \
ipfilter \
ipfs \
@@ -72,7 +69,6 @@ FILES= DAEMON \
mdconfig \
mdconfig2 \
mountd \
- moused \
mroute6d \
msgs \
natd \
@@ -87,14 +83,11 @@ FILES= DAEMON \
nisdomain \
${_nscd} \
nsswitch \
- ntpd \
ntpdate \
${_opensm} \
- othermta \
pf \
pflog \
pfsync \
- powerd \
ppp \
pppoed \
pwcheck \
@@ -124,17 +117,14 @@ FILES= DAEMON \
stf \
swap \
swaplate \
- syscons \
sysctl \
syslogd \
- timed \
tmp \
${_ubthidhci} \
ugidfw \
${_unbound} \
${_utx} \
var \
- virecover \
watchdogd \
ypbind \
yppasswdd \
@@ -153,6 +143,10 @@ FILES+= accounting
FILES+= power_profile
.endif
+.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
+FILES+= powerd
+.endif
+
.if ${MK_AMD} != "no"
FILES+= amd
.endif
@@ -175,6 +169,10 @@ _hcsecd= hcsecd
_ubthidhci= ubthidhci
.endif
+.if ${MK_BOOTPARAMD} != "no"
+FILES+= bootparams
+.endif
+
.if ${MK_BSNMP} != "no"
FILES+= bsnmpd
.endif
@@ -187,10 +185,18 @@ _casperd= casperd
FILES+= ccd
.endif
+.if ${MK_FTP} != "no"
+FILES+= ftpd
+.endif
+
.if ${MK_HAST} != "no"
FILES+= hastd
.endif
+.if ${MK_INETD} != "no"
+_inetd= inetd
+.endif
+
.if ${MK_ISCSI} != "no"
FILES+= iscsictl
FILES+= iscsid
@@ -200,12 +206,13 @@ FILES+= iscsid
FILES+= jail
.endif
-.if ${MK_LPR} != "no"
-FILES+= lpd
+.if ${MK_LEGACY_CONSOLE} != "no"
+FILES+= moused
+FILES+= syscons
.endif
-.if ${MK_NS_CACHING} != "no"
-_nscd= nscd
+.if ${MK_LPR} != "no"
+FILES+= lpd
.endif
.if ${MK_KERBEROS} != "no"
@@ -217,6 +224,18 @@ _kfd= kfd
_kpasswdd= kpasswdd
.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
@@ -237,6 +256,18 @@ FILES+= ftp-proxy
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
@@ -245,6 +276,10 @@ _unbound= local_unbound
_utx= utx
.endif
+.if ${MK_VI} != "no"
+FILES+= virecover
+.endif
+
.if ${MK_WIRELESS} != "no"
FILES+= hostapd
FILES+= wpa_supplicant
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
