From owner-cvs-all@FreeBSD.ORG Thu Oct 27 09:19:26 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 100AC16A41F; Thu, 27 Oct 2005 09:19:26 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (comp.chem.msu.su [158.250.32.97]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0E0E43D48; Thu, 27 Oct 2005 09:19:24 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (localhost [127.0.0.1]) by comp.chem.msu.su (8.13.3/8.13.3) with ESMTP id j9R9JLPH012921; Thu, 27 Oct 2005 13:19:21 +0400 (MSD) (envelope-from yar@comp.chem.msu.su) Received: (from yar@localhost) by comp.chem.msu.su (8.13.3/8.13.3/Submit) id j9R9JLvO012920; Thu, 27 Oct 2005 13:19:21 +0400 (MSD) (envelope-from yar) Date: Thu, 27 Oct 2005 13:19:20 +0400 From: Yar Tikhiy To: Pawel Jakub Dawidek Message-ID: <20051027091920.GA11982@comp.chem.msu.su> Mail-Followup-To: yar@comp.chem.msu.su, pjd@FreeBSD.org, freebsd-rc@FreeBSD.org References: <200510231406.j9NE6r8L008373@repoman.freebsd.org> <20051027063353.GA63896@garage.freebsd.pl> <20051027071456.GA6598@comp.chem.msu.su> <20051027082115.GA749@garage.freebsd.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20051027082115.GA749@garage.freebsd.pl> User-Agent: Mutt/1.5.9i Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, freebsd-rc@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/etc/rc.d ike named ppp-user sshd X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 09:19:26 -0000 On Thu, Oct 27, 2005 at 10:21:16AM +0200, Pawel Jakub Dawidek wrote: > On Thu, Oct 27, 2005 at 11:14:56AM +0400, Yar Tikhiy wrote: > +> On Thu, Oct 27, 2005 at 08:33:53AM +0200, Pawel Jakub Dawidek wrote: > +> > On Sun, Oct 23, 2005 at 02:06:53PM +0000, Yar Tikhiy wrote: > +> > +> yar 2005-10-23 14:06:53 UTC > +> > +> > +> > +> FreeBSD src repository > +> > +> > +> > +> Modified files: > +> > +> etc/rc.d ike named ppp-user sshd > +> > +> Log: > +> > +> Don't be lazy, set the "command" variable even if > +> > +> /etc/defaults/rc.conf will provide foo_program, too. > +> > +> By specifying "command" we explicitly say that we're > +> > +> going to rely on rc.subr(8) default methods, and > +> > +> rc.subr(8) will take advantage of this soon. > +> > +> > +> > +> The majority of our rc.d scripts already set "command" > +> > +> if appropriate, so fix just the non-compliant handful. > +> > [...] > +> > +> name="named" > +> > +> rcvar=`set_rcvar` > +> > +> +command="/usr/sbin/${name}" > +> > [...] > +> > +> name="ppp" > +> > +> rcvar=`set_rcvar` > +> > +> +command="/usr/sbin/ppp" > +> > [...] > +> > +> name="sshd" > +> > +> rcvar=`set_rcvar` > +> > +> +command="/usr/sbin/${name}" > +> > > +> > Any reason you didn't used ${name} in ppp case? > +> > +> I was just blinded by my being solid sure that $name was "ppp-user". > +> Nowever, now I'm in doubt whether $name should be "ppp". The script > +> is named ppp-user and it PROVIDEs ppp-user, hence sysadmins can > +> rightfully assume that its rc.conf.d file is ppp-user, too. Such > +> assumption will be broken since it is $name that is passed to > +> load_rc_config. I think $name should be changed to "ppp-user" in > +> CURRENT. This will introduce minor incompatibility, but also > +> eliminate a source of further confusion. > > It is confusing, but maybe we should rename ppp-user to ppp? > I'm not sure how well sh(1) will handle things like > ppp-user_enable="YES", etc. Yes, this is much better than my lame proposal because so we will have to worry about neither variable naming nor compatibility with installations using ppp and rc.conf.d at once. We change the PROVIDE line and fix all dependent rc.d scripts, then request the repocopy of ppp-user to ppp, fix /etc/netstart, and finally kill the old file. Does this plan look OK? P.S. Looks like it's time to move this thread to -rc, setting Mail-Followup-To accordingly. -- Yar