From owner-cvs-src@FreeBSD.ORG Sun Oct 10 13:38:23 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2187316A4CE; Sun, 10 Oct 2004 13:38:23 +0000 (GMT) Received: from srv01.sparkit.no (srv01.sparkit.no [193.69.116.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79EF943D46; Sun, 10 Oct 2004 13:38:22 +0000 (GMT) (envelope-from eivind@FreeBSD.org) Received: from ws.nada ([193.69.114.88]) by srv01.sparkit.no (8.12.11/8.12.11) with ESMTP id i9ADc5wt083922; Sun, 10 Oct 2004 15:38:05 +0200 (CEST) (envelope-from eivind@FreeBSD.org) Received: from ws.nada (localhost [127.0.0.1]) by ws.nada (8.12.9/8.12.10) with ESMTP id i9ADXkDo001399; Sun, 10 Oct 2004 13:33:46 GMT (envelope-from eivind@ws.nada) Received: (from eivind@localhost) by ws.nada (8.12.9/8.12.10/Submit) id i9ADXkHx001398; Sun, 10 Oct 2004 13:33:46 GMT (envelope-from eivind) Date: Sun, 10 Oct 2004 13:33:45 +0000 From: Eivind Eklund To: Giorgos Keramidas Message-ID: <20041010133345.GA1039@FreeBSD.org> References: <20041009114544.080344bd@dev.lan.Awfulhak.org> <20041009222726U.matusita@jp.FreeBSD.org> <20041009184627.26e9a57f@dev.lan.Awfulhak.org> <20041010031208L.matusita@jp.FreeBSD.org> <20041010103151.GA47927@gothmog.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041010103151.GA47927@gothmog.gr> User-Agent: Mutt/1.5.4i cc: Makoto Matsushita cc: brian@Awfulhak.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: cvs-src@FreeBSD.org Subject: Re: What we keep under /etc (was: cvs commit: src/etc rc rc.shutdown src/etc/rc.d ...) X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Oct 2004 13:38:23 -0000 On Sun, Oct 10, 2004 at 01:31:52PM +0300, Giorgos Keramidas wrote: > On 2004-10-10 03:12, Makoto Matsushita wrote: > > brian> Ok, so etc/mtree can be left out. What about etc/periodic and etc/rc.d? > > [...] > > If there's a chance that users may modify /etc files, "overriding /etc > > files silently" should be avoided as we can, IMHO. > > The overwriting of some directories in /etc can be made optional and default > to off (keeping the current behavior, but allowing faster updates of a part of > /etc for those who want it), if that's what's worrying you. > > We could add an option to mergemaster like -f which would take a list of /etc > subdirectories to blindly overwrite If you are going to fix mergemaster, I suggest you do it right. Upgrade it to do a 3-way merge, and create the base by logging what mergemaster created the last time. This is relatively simple; the code to do everything around /etc updates based on 3-way merge is fairly precisely half the size of mergemaster's code (because there is less fiddling with weird cases when doing things right.) Adding more kludges to mergemaster is a bad idea. If the way it presently works annoy you (and it does me), either fix it to do things right (which is a 3-way merge), or replace it with something that does the right thing. Eivind.