From owner-freebsd-arch Sun Jan 7 16:35:13 2001 Delivered-To: freebsd-arch@freebsd.org Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by hub.freebsd.org (Postfix) with ESMTP id 26EA637B69E for ; Sun, 7 Jan 2001 16:34:18 -0800 (PST) Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.11.0/8.11.0) id f080YB529477; Sun, 7 Jan 2001 16:34:11 -0800 Date: Sun, 7 Jan 2001 16:34:11 -0800 From: Brooks Davis To: "DINKEY,GENE (HP-Loveland,ex1)" Cc: "'Doug Barton'" , freebsd-arch@FreeBSD.ORG Subject: Re: Is /etc/mergemaster.conf desirable? Message-ID: <20010107163411.A13527@Odin.AC.HMC.Edu> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i In-Reply-To: ; from gene_dinkey@hp.com on Sun, Jan 07, 2001 at 07:16:39AM -0800 Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Sun, Jan 07, 2001 at 07:16:39AM -0800, DINKEY,GENE (HP-Loveland,ex1) wrote: > Also since mergemaster needs to be tuned for the > system it's on I would think that /usr/local/etc would be an appropriate > place to put the mergemaster.conf. No. It needs to be in /etc because it's part of the base. The most correct solution is probably: /etc/defaults/mergemaster.conf (this opens the following two) /etc/mergemaster.conf /etc/mergemaster.conf.local Skipping the /etc/defaults file would probably be ok, but they are the trend and I think they are a very good idea. -- Brooks -- Any statement of the form "X is the one, true Y" is FALSE. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message