From owner-svn-src-head@freebsd.org Sun Jul 29 17:36:00 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE6EE105BF85 for ; Sun, 29 Jul 2018 17:36:00 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A1EC885F2 for ; Sun, 29 Jul 2018 17:36:00 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-RoutePath: aGlwcGll X-MHO-User: d92369b2-9355-11e8-904b-1d2e466b3c59 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound2.ore.mailhop.org (Halon) with ESMTPSA id d92369b2-9355-11e8-904b-1d2e466b3c59; Sun, 29 Jul 2018 17:35:56 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id w6THZtmg029792; Sun, 29 Jul 2018 11:35:55 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1532885755.61594.122.camel@freebsd.org> Subject: Re: svn commit: r336859 - head/sbin/init/rc.d From: Ian Lepore To: Don Lewis Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Sun, 29 Jul 2018 11:35:55 -0600 In-Reply-To: References: <201807290542.w6T5g8rt018138@repo.freebsd.org> <1532873787.61594.107.camel@freebsd.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2018 17:36:00 -0000 On Sun, 2018-07-29 at 09:59 -0700, Don Lewis wrote: > On 29 Jul, Ian Lepore wrote: > > On Sun, 2018-07-29 at 05:42 +0000, Don Lewis wrote: > >> Author: truckman > >> Date: Sun Jul 29 05:42:07 2018 > >> New Revision: 336859 > >> URL: https://svnweb.freebsd.org/changeset/base/336859 > >>  > >> Log: > >>   Fix a variable name typo in r336845 that prevented the rc.d scripts > >>   from being installed in the correct directory. > >>    > >>   Resurrect a few rc.d scripts that were prematurely deleted from the > >>   Makefile by r336845. > >>    > >>   Reviewed by:       brd > >>  > >> Modified: > >>   head/sbin/init/rc.d/Makefile > >>  > >> Modified: head/sbin/init/rc.d/Makefile > >> ===================================================================== > >> ========= > >> --- head/sbin/init/rc.d/Makefile     Sun Jul 29 05:14:26 2018         > >> (r336858) > >> +++ head/sbin/init/rc.d/Makefile     Sun Jul 29 05:42:07 2018         > >> (r336859) > >> @@ -2,7 +2,7 @@ > >>   > >>  .include > >>   > >> -CONFSDIR=   /etc/rc.d > >> +CONFDIR=    /etc/rc.d > >>  CONFGROUPS= CONFS > >>   > >  > > I'm pretty sure CONFSDIR was right here. You are now trapped in a maze > > of small twisty variable names, all alike. > > Without this change, the rc.d scripts get installed directly under > /var/tmp/temproot/etc/ and mergemaster wants to delete the scripts under > /etc/rc.d.  Answering yes to that mergemaster question results in an > unbootable system. > > I see the following in /usr/share/mk/bsd.confs.mk: >   ${group}DIR?=   ${CONFDIR} > but I don't see ${CONFSDIR} anywhere. > You don't see CONFSDIR because it appears as ${group}DIR and with CONFGROUPS?= CONFS that turns into CONFSDIR. So now the question is why doesn't setting CONFSDIR work in this makefile, but it works in others? -- Ian > After this commit, mergemaster works properly again. > > > CONFGROUPS=CONFS is the default set by bsd.conf.mk, and it's the only > > one that needs CONF to be singular. Perhaps if we establish the idiom > > of not re-specifying the default value in all the individual makefiles, > > that'll leave everything as CONFS* and it'll be a bit less confusing? > >  > > -- Ian > >