From owner-svn-src-all@freebsd.org Sun Jul 29 16:59:08 2018 Return-Path: Delivered-To: svn-src-all@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 CDE89105B31A; Sun, 29 Jul 2018 16:59:08 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7B26B86B03; Sun, 29 Jul 2018 16:59:08 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mousie.catspoiler.org (unknown [76.212.85.177]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: truckman) by smtp.freebsd.org (Postfix) with ESMTPSA id B500222CCD; Sun, 29 Jul 2018 16:59:07 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Date: Sun, 29 Jul 2018 09:59:05 -0700 (PDT) From: Don Lewis Subject: Re: svn commit: r336859 - head/sbin/init/rc.d To: Ian Lepore cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org In-Reply-To: <1532873787.61594.107.camel@freebsd.org> Message-ID: References: <201807290542.w6T5g8rt018138@repo.freebsd.org> <1532873787.61594.107.camel@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Content-Disposition: INLINE X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2018 16:59:09 -0000 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 >>=20 >> Log: >> =A0 Fix a variable name typo in r336845 that prevented the rc.d scripts >> =A0 from being installed in the correct directory. >> =A0=A0 >> =A0 Resurrect a few rc.d scripts that were prematurely deleted from the >> =A0 Makefile by r336845. >> =A0=A0 >> =A0 Reviewed by:=09brd >>=20 >> Modified: >> =A0 head/sbin/init/rc.d/Makefile >>=20 >> 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=09Sun Jul 29 05:14:26 2018=09 >> (r336858) >> +++ head/sbin/init/rc.d/Makefile=09Sun Jul 29 05:42:07 2018=09 >> (r336859) >> @@ -2,7 +2,7 @@ >> =A0 >> =A0.include >> =A0 >> -CONFSDIR=3D=09/etc/rc.d >> +CONFDIR=3D=09/etc/rc.d >> =A0CONFGROUPS=3D=09CONFS >> =A0 >=20 > 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?=3D ${CONFDIR} but I don't see ${CONFSDIR} anywhere. After this commit, mergemaster works properly again. > CONFGROUPS=3DCONFS 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? >=20 > -- Ian