Date: Wed, 27 Aug 2014 07:41:34 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Hiroki Sato <hrs@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r270676 - head/etc Message-ID: <20140827054134.GF65120@ivaldir.etoilebsd.net> In-Reply-To: <20140827.134800.2047075166971853210.hrs@allbsd.org> References: <201408262233.s7QMXYfd056791@svn.freebsd.org> <20140827.134800.2047075166971853210.hrs@allbsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <bapt@FreeBSD.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140827054134.GF65120>