From owner-freebsd-rc@FreeBSD.ORG Sat Mar 25 11:07:22 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 3BE1316A538 for ; Sat, 25 Mar 2006 11:07:22 +0000 (UTC) (envelope-from flz@xbsd.org) Received: from smtp.xbsd.org (xbsd.org [82.233.2.192]) by mx1.FreeBSD.org (Postfix) with ESMTP id B31C343D45 for ; Sat, 25 Mar 2006 11:07:21 +0000 (GMT) (envelope-from flz@xbsd.org) Received: from localhost (localhost.xbsd.org [127.0.0.1]) by smtp.xbsd.org (Postfix) with ESMTP id 3A45811796; Sat, 25 Mar 2006 12:07:14 +0100 (CET) Received: from smtp.xbsd.org ([127.0.0.1]) by localhost (srv1.xbsd.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 38723-02; Sat, 25 Mar 2006 12:07:08 +0100 (CET) Received: from [192.168.1.102] (unknown [83.141.123.158]) by smtp.xbsd.org (Postfix) with ESMTP id A7F9011604; Sat, 25 Mar 2006 12:07:06 +0100 (CET) In-Reply-To: <20060324205627.GA18100@odin.ac.hmc.edu> References: <1143202549.16053.145.camel@mayday.esat.net> <20060324205627.GA18100@odin.ac.hmc.edu> Mime-Version: 1.0 (Apple Message framework v746.3) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <00E087F1-81E4-4580-A655-50F3DD8A471F@xbsd.org> Content-Transfer-Encoding: 7bit From: Florent Thoumie Date: Sat, 25 Mar 2006 11:06:46 +0000 To: Brooks Davis X-Mailer: Apple Mail (2.746.3) X-Virus-Scanned: amavisd-new at xbsd.org 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: Sat, 25 Mar 2006 11:07:22 -0000 On Mar 24, 2006, at 8:56 PM, Brooks Davis wrote: > 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. >> >> 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. >> >> 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}. >> >> 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? Somehow, command gets set to the right value, but you're right, I'm missing a bit here. > 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}" != "/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. Fair enough, but I'd like to add a note saying that /etc/rc.conf.d/$ {name} is deprecated for ${etcdir} != "/etc". I'll write a new patch this week end. Thanks Brooks. -- Florent Thoumie flz@FreeBSD.org FreeBSD Committer