From owner-svn-src-all@FreeBSD.ORG Mon Feb 2 05:17:27 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36801BEA; Mon, 2 Feb 2015 05:17:27 +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 2272FB56; Mon, 2 Feb 2015 05:17:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t125HRpN038342; Mon, 2 Feb 2015 05:17:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t125HQNl038341; Mon, 2 Feb 2015 05:17:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502020517.t125HQNl038341@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 2 Feb 2015 05:17:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278052 - stable/10/etc/rc.d X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 05:17:27 -0000 Author: ngie Date: Mon Feb 2 05:17:26 2015 New Revision: 278052 URL: https://svnweb.freebsd.org/changeset/base/278052 Log: MFC r271892: r271892 (by ngie): Sort the optional rc.d scripts by their knobs Sponsored by: EMC / Isilon Storage Division Modified: stable/10/etc/rc.d/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/rc.d/Makefile ============================================================================== --- stable/10/etc/rc.d/Makefile Mon Feb 2 04:54:43 2015 (r278051) +++ stable/10/etc/rc.d/Makefile Mon Feb 2 05:17:26 2015 (r278052) @@ -169,6 +169,13 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_BLUETOOTH} != "no" +_bluetooth= bluetooth +_bthidd= bthidd +_hcsecd= hcsecd +_ubthidhci= ubthidhci +.endif + .if ${MK_IPX} != "no" _ipxrouted= ipxrouted .endif @@ -180,6 +187,10 @@ _kfd= kfd _kpasswdd= kpasswdd .endif +.if ${MK_NS_CACHING} != "no" +_nscd= nscd +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif @@ -188,17 +199,6 @@ _opensm= opensm _sshd= sshd .endif -.if ${MK_NS_CACHING} != "no" -_nscd= nscd -.endif - -.if ${MK_BLUETOOTH} != "no" -_bluetooth= bluetooth -_bthidd= bthidd -_hcsecd= hcsecd -_ubthidhci= ubthidhci -.endif - .if ${MK_UNBOUND} != "no" _unbound= local_unbound .endif