From owner-cvs-src@FreeBSD.ORG Thu Aug 31 16:04:55 2006 Return-Path: X-Original-To: cvs-src@freebsd.org 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 26A0616A4E2; Thu, 31 Aug 2006 16:04:55 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 015C143D8A; Thu, 31 Aug 2006 16:04:39 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [127.0.0.1] (may be forged)) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k7VG34s9022887; Thu, 31 Aug 2006 10:03:04 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 31 Aug 2006 10:03:19 -0600 (MDT) Message-Id: <20060831.100319.756907628.imp@bsdimp.com> To: ru@freebsd.org From: "M. Warner Losh" In-Reply-To: <20060831100004.GB52914@rambler-co.ru> References: <20060830202834.GA11284@rambler-co.ru> <20060831100004.GB52914@rambler-co.ru> X-Mailer: Mew version 4.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Thu, 31 Aug 2006 10:03:04 -0600 (MDT) Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org, gad@freebsd.org Subject: Re: "Chatty" config files in /etc X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 31 Aug 2006 16:04:55 -0000 In message: <20060831100004.GB52914@rambler-co.ru> Ruslan Ermilov writes: : > b) by putting them in /etc/defaults, users do *see* the changes : > when they run mergemaster, even though they won't have to : > merge those changes with local changes. In some cases the : > changes to the comments or examples will suggest some change : > that the user should be making to their own already-working : > configuration, even though their configuration won't match : > the default system-config. I'm thinking when some comment : > is added like: : > # NOTE: Please see pf.conf(5) BUGS section before : > # using user/group rules. : > : No, /etc/defaults are different beasties -- they are true : default config files -- they are either used if there's no : corresponding version under /etc, or most likely sourced : to provide defaults. To be moved to /etc/defaults, a file : should gain the same property. Agreed. We've done this with all the other ones... I'd be real careful about doing it to /etc/hosts, however, as there are a large number of tools that munge it that might break if this is done badly... Warner