From owner-svn-src-head@freebsd.org Sun Jul 29 17:47:43 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 C8EBE105C44B; Sun, 29 Jul 2018 17:47:43 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (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 761B088F90; Sun, 29 Jul 2018 17:47:43 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3246220F02; Sun, 29 Jul 2018 13:47:43 -0400 (EDT) Received: from web6 ([10.202.2.216]) by compute5.internal (MEProxy); Sun, 29 Jul 2018 13:47:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=C6V37t lBrM4WVVUGQniLlKYjGr/a1qkUCGwa+WXK/14=; b=qkEu8cEteuIb65iWpVsEfw jtF5I2cEhDOOS6/94O4bcxpPTYRX8nsbq6djBAQ5p30p4tyeiblDtS5/LbU+FykF dd5SFADRNBrEigKZg2iwTCEQDfEK5t3x62bbEOHVawNGtlEBq5Qgj0r3wS5w9dX0 X7syG3ab5VHhOWtajzNrcs3lLmCvL/63I2LEut/gaIcdoNRCKrFfR1ci2FBR5ZQx mTVdbjmjGoNmhTtUCyMxE91bCVlSmgs1CEuRKHUBh4asgkAaDK+8euGVObylBmRw 0hm7ccMDH/NAyYGTpuQIMZc6/3+oTqf72vQ/YDUYKd2TcHzsjM56O8mb2oMsrABw == X-ME-Proxy: X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id B16E141EB; Sun, 29 Jul 2018 13:47:42 -0400 (EDT) Message-Id: <1532886462.1211531.1456577968.06E21EAE@webmail.messagingengine.com> From: Brad Davis To: Ian Lepore , Don Lewis Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-0843ff3e In-Reply-To: <1532885755.61594.122.camel@freebsd.org> Date: Sun, 29 Jul 2018 11:47:42 -0600 Subject: Re: svn commit: r336859 - head/sbin/init/rc.d References: <201807290542.w6T5g8rt018138@repo.freebsd.org> <1532873787.61594.107.camel@freebsd.org> <1532885755.61594.122.camel@freebsd.org> 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:47:44 -0000 On Sun, Jul 29, 2018, at 11:35 AM, Ian Lepore wrote: > 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 > > >>=C2=A0 > > >> Log: > > >> =C2=A0 Fix a variable name typo in r336845 that prevented the rc.d s= cripts > > >> =C2=A0 from being installed in the correct directory. > > >> =C2=A0=C2=A0 > > >> =C2=A0 Resurrect a few rc.d scripts that were prematurely deleted fr= om the > > >> =C2=A0 Makefile by r336845. > > >> =C2=A0=C2=A0 > > >> =C2=A0 Reviewed by:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0brd > > >>=C2=A0 > > >> Modified: > > >> =C2=A0 head/sbin/init/rc.d/Makefile > > >>=C2=A0 > > >> Modified: head/sbin/init/rc.d/Makefile > > >> =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 > > >> --- head/sbin/init/rc.d/Makefile=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Sun Ju= l 29 05:14:26 2018=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > >> (r336858) > > >> +++ head/sbin/init/rc.d/Makefile=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Sun Ju= l 29 05:42:07 2018=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > >> (r336859) > > >> @@ -2,7 +2,7 @@ > > >> =C2=A0 > > >> =C2=A0.include=20 > > >> =C2=A0 > > >> -CONFSDIR=3D=C2=A0=C2=A0=C2=A0/etc/rc.d > > >> +CONFDIR=3D=C2=A0=C2=A0=C2=A0=C2=A0/etc/rc.d > > >> =C2=A0CONFGROUPS=3D=C2=A0CONFS > > >> =C2=A0 > > >=C2=A0 > > > I'm pretty sure CONFSDIR was right here. You are now trapped in a maze > > > of small twisty variable names, all alike. > >=20 > > 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.=C2=A0 Answering yes to that mergemaster question results in = an > > unbootable system. > >=20 > > I see the following in /usr/share/mk/bsd.confs.mk: > > =C2=A0 ${group}DIR?=3D=C2=A0=C2=A0 ${CONFDIR} > > but I don't see ${CONFSDIR} anywhere. > >=20 >=20 > You don't see CONFSDIR because it appears as ${group}DIR and with > CONFGROUPS?=3D CONFS that turns into CONFSDIR. So now the question is why > doesn't setting CONFSDIR work in this makefile, but it works in others? >=20 > -- Ian >=20 > > After this commit, mergemaster works properly again. > >=20 > > > CONFGROUPS=3DCONFS is the default set by bsd.conf.mk, and it's the on= ly > > > one that needs CONF to be singular. Perhaps if we establish the idiom > > > of not re-specifying the default value in all the individual makefile= s, > > > that'll leave everything as CONFS* and it'll be a bit less confusing? I spoke with Ian on IRC about this, but for everyone else following along h= ere.. This works because CONFDIR is the default for all CONFGROUPS, where as CONF= SDIR only applied to the CONFS group. Regards, Brad Davis