Author: ngie
Date: Tue Mar 24 08:22:48 2015
New Revision: 280426
URL: https://svnweb.freebsd.org/changeset/base/280426
Log:
MFstable/10 r278052,r278190,r278191,r278574,r278575,r280422:
r278052:
MFC r271892:
r271892:
Sort the optional rc.d scripts by their knobs
Sponsored by: EMC / Isilon Storage Division
r278190:
MFC r277732:
r277732:
Honor MK_API in etc/rc.d
Sponsored by: EMC / Isilon Storage Division
r278191:
MFC r277733:
r277733:
Honor MK_AMD with etc/rc.d/amd
Sponsored by: EMC / Isilon Storage Division
r278574:
MFC r277736:
r277736:
Honor MK_ACCT with etc/rc.d/accounting
Sponsored by: EMC / Isilon Storage Division
r278575:
Remove etc/rc.d/accounting from FILES
r280422:
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 <guy...@gmail.com>
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/rc.d/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile Tue Mar 24 08:21:36 2015 (r280425)
+++ stable/9/etc/rc.d/Makefile Tue Mar 24 08:22:48 2015 (r280426)
@@ -18,7 +18,6 @@ FILES= DAEMON \
auditdistd \
bgfsck \
${_bluetooth} \
- bootparams \
bridge \
${_bthidd} \
cleanvar \
@@ -34,8 +33,6 @@ FILES= DAEMON \
encswap \
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 \
kerberos \
- keyserv \
kld \
kldxref \
kpasswdd \
@@ -73,7 +68,6 @@ FILES= DAEMON \
mdconfig \
mdconfig2 \
mountd \
- moused \
mroute6d \
mrouted \
msgs \
@@ -90,14 +84,11 @@ FILES= DAEMON \
nisdomain \
${_nscd} \
nsswitch \
- ntpd \
ntpdate \
${_opensm} \
- othermta \
pf \
pflog \
pfsync \
- powerd \
ppp \
pppoed \
pwcheck \
@@ -109,16 +100,13 @@ FILES= DAEMON \
rfcomm_pppd_server \
root \
route6d \
- routed \
routing \
rpcbind \
rtadvd \
rtsold \
- rwho \
savecore \
sdpd \
securelevel \
- sendmail \
serial \
sppp \
${_sshd} \
@@ -127,10 +115,8 @@ FILES= DAEMON \
static_ndp \
stf \
swap1 \
- syscons \
sysctl \
syslogd \
- timed \
tmp \
${_ubthidhci} \
ugidfw \
@@ -150,19 +136,34 @@ FILES= DAEMON \
FILES+= accounting
.endif
-.if ${MK_AMD} != "no"
-FILES+= amd
-.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
+
.if ${MK_APM} != "no"
FILES+= apm
FILES+= apmd
.endif
+.if ${MK_BLUETOOTH} != "no"
+_bluetooth= bluetooth
+_bthidd= bthidd
+_hcsecd= hcsecd
+_ubthidhci= ubthidhci
+.endif
+
+.if ${MK_BOOTPARAMD} != "no"
+FILES+= bootparams
+.endif
+
.if ${MK_BSNMP} != "no"
FILES+= bsnmpd
.endif
@@ -171,10 +172,18 @@ FILES+= bsnmpd
FILES+= ccd
.endif
+.if ${MK_FTP} != "no"
+FILES+= ftpd
+.endif
+
.if ${MK_HAST} != "no"
FILES+= hastd
.endif
+.if ${MK_INETD} != "no"
+FILES+= inetd
+.endif
+
.if ${MK_IPX} != "no"
_ipxrouted= ipxrouted
.endif
@@ -183,27 +192,57 @@ _ipxrouted= ipxrouted
FILES+= jail
.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_NS_CACHING} != "no"
-_nscd= nscd
+.if ${MK_PF} != "no"
+FILES+= ftp-proxy
.endif
-.if ${MK_BLUETOOTH} != "no"
-_bluetooth= bluetooth
-_bthidd= bthidd
-_hcsecd= hcsecd
-_ubthidhci= ubthidhci
+.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_WIRELESS} != "no"
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 24 08:21:36
2015 (r280425)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Tue Mar 24 08:22:48
2015 (r280426)
@@ -3303,9 +3303,9 @@ OLD_FILES+=usr/libexec/ssh-pkcs11-helper
OLD_FILES+=usr/sbin/sshd
.endif
-#.if ${MK_OPENSSL} == no
-# to be filled in
-#.endif
+.if ${MK_OPENSSL} == no
+OLD_FILES+=etc/rc.d/keyserv
+.endif
.if ${MK_SYSINSTALL} == no
OLD_FILES+=usr/sbin/sysinstall
@@ -3414,6 +3414,7 @@ OLD_DIRS+=usr/share/examples/pc-sysinsta
.if ${MK_PF} == no
OLD_FILES+=etc/periodic/security/520.pfdenied
OLD_FILES+=etc/pf.os
+OLD_FILES+=etc/rc.d/ftp-proxy
OLD_FILES+=sbin/pfctl
OLD_FILES+=sbin/pflogd
OLD_FILES+=usr/libexec/tftp-proxy
@@ -3596,6 +3597,7 @@ OLD_FILES+=usr/lib/private/libssh_p.a
.if ${MK_RCMDS} == no
OLD_FILES+=bin/rcp
+OLD_FILES+=etc/rc.d/rwho
OLD_FILES+=etc/periodic/daily/140.clean-rwho
OLD_FILES+=etc/periodic/daily/430.status-rwho
OLD_FILES+=rescue/rcp
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
