Date: Sun, 29 Jul 2018 11:47:42 -0600 From: Brad Davis <brd@FreeBSD.org> To: Ian Lepore <ian@freebsd.org>, Don Lewis <truckman@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r336859 - head/sbin/init/rc.d Message-ID: <1532886462.1211531.1456577968.06E21EAE@webmail.messagingengine.com> In-Reply-To: <1532885755.61594.122.camel@freebsd.org> References: <201807290542.w6T5g8rt018138@repo.freebsd.org> <1532873787.61594.107.camel@freebsd.org> <tkrat.ba85a2c19f614432@FreeBSD.org> <1532885755.61594.122.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1532886462.1211531.1456577968.06E21EAE>