From owner-svn-src-all@freebsd.org Sun Jul 29 22:48:13 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 052FB1065DB6; Sun, 29 Jul 2018 22:48:13 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 A1FE67D754; Sun, 29 Jul 2018 22:48:12 +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 B8FCB25033; Sun, 29 Jul 2018 22:48:11 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Date: Sun, 29 Jul 2018 15:48:10 -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: <1532885755.61594.122.camel@freebsd.org> Message-ID: References: <201807290542.w6T5g8rt018138@repo.freebsd.org> <1532873787.61594.107.camel@freebsd.org> <1532885755.61594.122.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 22:48:13 -0000 On 29 Jul, 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 >> >>=A0 >> >> Log: >> >> =A0 Fix a variable name typo in r336845 that prevented the rc.d scrip= ts >> >> =A0 from being installed in the correct directory. >> >> =A0=A0 >> >> =A0 Resurrect a few rc.d scripts that were prematurely deleted from t= he >> >> =A0 Makefile by r336845. >> >> =A0=A0 >> >> =A0 Reviewed by:=A0=A0=A0=A0=A0=A0=A0brd >> >>=A0 >> >> Modified: >> >> =A0 head/sbin/init/rc.d/Makefile >> >>=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=A0=A0=A0=A0=A0Sun Jul 29 05:14:26 20= 18=A0=A0=A0=A0=A0=A0=A0=A0 >> >> (r336858) >> >> +++ head/sbin/init/rc.d/Makefile=A0=A0=A0=A0=A0Sun Jul 29 05:42:07 20= 18=A0=A0=A0=A0=A0=A0=A0=A0 >> >> (r336859) >> >> @@ -2,7 +2,7 @@ >> >> =A0 >> >> =A0.include=20 >> >> =A0 >> >> -CONFSDIR=3D=A0=A0=A0/etc/rc.d >> >> +CONFDIR=3D=A0=A0=A0=A0/etc/rc.d >> >> =A0CONFGROUPS=3D=A0CONFS >> >> =A0 >> >=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.=A0 Answering yes to that mergemaster question results in an >> unbootable system. >>=20 >> I see the following in /usr/share/mk/bsd.confs.mk: >> =A0 ${group}DIR?=3D=A0=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? I don't know, but with undoing my change with this: Index: 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 --- sbin/init/rc.d/Makefile=09(revision 336859) +++ sbin/init/rc.d/Makefile=09(working copy) @@ -2,7 +2,7 @@ =20 .include =20 -CONFDIR=3D=09/etc/rc.d +CONFSDIR=3D=09/etc/rc.d CONFGROUPS=3D=09CONFS =20 CONFS=3D=09DAEMON \ gives me this in mergemaster: *** Beginning comparison *** Checking /etc/rc.d for stale files *** The following files exist in /etc/rc.d but not in /var/tmp/temproot/etc/rc.d/: accounting amd apm bsnmpd hastd jail local_unbound power_profile sendmail = sshd virecover zfs zfsbe zfsd zvol The presence of stale files in this directory can cause the dreaded unpredictable results, and therefore it is highly recommended that you delete them. *** Delete them now? [n]=20