From owner-svn-src-head@FreeBSD.ORG Thu Feb 5 11:38:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 56137377; Thu, 5 Feb 2015 11:38:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41D50C61; Thu, 5 Feb 2015 11:38:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15BcUFr070664; Thu, 5 Feb 2015 11:38:30 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15BcUlj070663; Thu, 5 Feb 2015 11:38:30 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502051138.t15BcUlj070663@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 5 Feb 2015 11:38:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278249 - head/etc/rc.d X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 11:38:30 -0000 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