From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 05:41:42 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CE9C8FA; Wed, 27 Aug 2014 05:41:42 +0000 (UTC) Received: from mail-wg0-x22b.google.com (mail-wg0-x22b.google.com [IPv6:2a00:1450:400c:c00::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A0DE2354C; Wed, 27 Aug 2014 05:41:41 +0000 (UTC) Received: by mail-wg0-f43.google.com with SMTP id l18so15453099wgh.14 for ; Tue, 26 Aug 2014 22:41:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=y0tZaMGmmoqkRVT4yDFlOACrFEEiJuEiV4rsw2kB7NI=; b=YVDwHG8Tw8g7O6D3rX7wjM3RP6IYyg3exGQodCQYQ9qHjyicKV0lR58E6D6xYUqaT/ g/iupOefgfZ9kj+azgEKyCNy9LCCPJIflua+zx1l+vnwKIfHy9tCpu83xnVWcb7LmfDB hoVxlzuV6KJD1ZDKeUL2/2awTD5ScucsDuIrvUzjGhf37rnUulEE/cw0em2cSMBUW0Xq w6HpD30dU2sBy+TNcTfwabcdpR6eMgaKBATBr53OYN+iM6sIca+Be0fo3xP59dj0WXSM 9ccQVzgtGRzoxt5KN6O2S5w0dvr54PtBTllP4DkwrWnrCs8HzZnFDawq2OguZS87d3n5 hvfg== X-Received: by 10.180.188.141 with SMTP id ga13mr25371739wic.18.1409118099887; Tue, 26 Aug 2014 22:41:39 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id xn15sm19858782wib.13.2014.08.26.22.41.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Aug 2014 22:41:36 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 27 Aug 2014 07:41:34 +0200 From: Baptiste Daroussin To: Hiroki Sato Subject: Re: svn commit: r270676 - head/etc Message-ID: <20140827054134.GF65120@ivaldir.etoilebsd.net> References: <201408262233.s7QMXYfd056791@svn.freebsd.org> <20140827.134800.2047075166971853210.hrs@allbsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="f61P+fpdnY2FZS1u" Content-Disposition: inline In-Reply-To: <20140827.134800.2047075166971853210.hrs@allbsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org 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: Wed, 27 Aug 2014 05:41:42 -0000 --f61P+fpdnY2FZS1u Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 27, 2014 at 01:48:00PM +0900, Hiroki Sato wrote: > Baptiste Daroussin wrote > in <201408262233.s7QMXYfd056791@svn.freebsd.org>: >=20 > ba> Author: bapt > ba> Date: Tue Aug 26 22:33:34 2014 > ba> New Revision: 270676 > ba> URL: http://svnweb.freebsd.org/changeset/base/270676 > ba> > ba> Log: > ba> Allow to configure services from ${LOCALBASE}/etc/rc.conf.d > ba> > ba> Reviewed by: bdrewery > ba> MFC after: 1 week > ba> Relnotes: yes > ba> > ba> Modified: > ba> head/etc/rc.subr > ba> > ba> Modified: head/etc/rc.subr > ba> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > ba> --- head/etc/rc.subr Tue Aug 26 22:20:02 2014 (r270675) > ba> +++ head/etc/rc.subr Tue Aug 26 22:33:34 2014 (r270676) > ba> @@ -1301,6 +1301,10 @@ load_rc_config() > ba> fi > ba> done > ba> fi > ba> + if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then > ba> + debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}" > ba> + . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" > ba> + fi >=20 > This should hornor ${local_startup} instead of ${LOCALBASE} since it > is not used in rc(8), and should be compatible with DES's commit in > r270392. >=20 > How about the attached patch? >=20 I do like it better than mine thank you regards, Bapt --f61P+fpdnY2FZS1u Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlP9b44ACgkQ8kTtMUmk6Ex0vACggYK9GJ+FbhPzkB3xT5wE+WCz hJYAnj+B0BkmSvt+jWSQABEHzyOsI0EM =mASg -----END PGP SIGNATURE----- --f61P+fpdnY2FZS1u--