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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 967bf80..4315f2d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3692,9 +3692,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_PC_SYSINSTALL} == no # backend-partmanager @@ -3788,6 +3788,7 @@ OLD_DIRS+=usr/share/examples/pc-sysinstall .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 @@ -3975,6 +3976,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 |
