From owner-freebsd-rc@FreeBSD.ORG Fri Mar 24 20:56:29 2006 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEABC16A420 for ; Fri, 24 Mar 2006 20:56:29 +0000 (UTC) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD16443D53 for ; Fri, 24 Mar 2006 20:56:28 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id k2OKuRom019124; Fri, 24 Mar 2006 12:56:27 -0800 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id k2OKuRUM019123; Fri, 24 Mar 2006 12:56:27 -0800 Date: Fri, 24 Mar 2006 12:56:27 -0800 From: Brooks Davis To: Florent Thoumie Message-ID: <20060324205627.GA18100@odin.ac.hmc.edu> References: <1143202549.16053.145.camel@mayday.esat.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline In-Reply-To: <1143202549.16053.145.camel@mayday.esat.net> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Cc: freebsd-rc@freebsd.org Subject: Re: rc.subr / rc.d/sshd patch for review X-BeenThere: freebsd-rc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Discussion related to /etc/rc.d design and implementation." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 20:56:30 -0000 --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 24, 2006 at 12:15:49PM +0000, Florent Thoumie wrote: > This is based on Oliver's patch for rc.d/sshd that can be found in > Gnats. >=20 > In load_rc_config, I'm extracting prefix from ${command} (or > ${name}_program, which part is moved from run_rc_command), and setting > etcdir accordingly. >=20 > The point is that some scripts (like rc.d/sshd) can be used for base > sshd as well as ports sshd, and makes possible to source > ${prefix}/etc/rc.conf.d/${name}. >=20 > This patch also documents ${name}_program above run_rc_command (though > it's actually used in load_rc_config). Is command always set? I'm pretty sure it isn't so this may not be entierly safe. If it's not set, should we try to guess prefix from $0? The other issue I see is that instead of: if [ -f ${etcdir}/rc.conf.d/"$_command" ]; then debug "Sourcing ${etcdir}/rc.conf.d/${_command}" . ${etcdir}/rc.conf.d/"$_command" fi I think we should do: if [ -f /etc/rc.conf.d/"$_command" ]; then debug "Sourcing /etc/rc.conf.d/${_command}" . /etc/rc.conf.d/"$_command" fi if [ "${etcdir}" !=3D "/etc" -a -f ${etcdir}/rc.conf.d/"$_command" ]; then debug "Sourcing ${etcdir}/rc.conf.d/${_command}" . ${etcdir}/rc.conf.d/"$_command" fi That preserves the old behavior while adding support for ${prefix}/etc/rc.conf.d. -- Brooks -- Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --6TrnltStXW4iwmi0 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFEJFz6XY6L6fI4GtQRAgZzAJ9V+VA2SSxnufdXoOot+XM/7Yk75ACgvyzT DtvudLi5ZuXgr1E9qBFjKFc= =ZpeL -----END PGP SIGNATURE----- --6TrnltStXW4iwmi0--