From owner-cvs-src@FreeBSD.ORG Thu Aug 31 09:59:40 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 2B66416A4DE; Thu, 31 Aug 2006 09:59:40 +0000 (UTC) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (relay0.rambler.ru [81.19.66.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97B5F43D49; Thu, 31 Aug 2006 09:59:39 +0000 (GMT) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (localhost [127.0.0.1]) by relay0.rambler.ru (Postfix) with ESMTP id 8BCC260BF; Thu, 31 Aug 2006 13:59:38 +0400 (MSD) Received: from edoofus.park.rambler.ru (unknown [81.19.65.108]) by relay0.rambler.ru (Postfix) with ESMTP id 66FEF60B5; Thu, 31 Aug 2006 13:59:38 +0400 (MSD) Received: (from ru@localhost) by edoofus.park.rambler.ru (8.13.6/8.13.6) id k7VA04JZ053326; Thu, 31 Aug 2006 14:00:04 +0400 (MSD) (envelope-from ru) Date: Thu, 31 Aug 2006 14:00:04 +0400 From: Ruslan Ermilov To: Garance A Drosehn Message-ID: <20060831100004.GB52914@rambler-co.ru> References: <200608290920.k7T9KmV9067843@repoman.freebsd.org> <86zmdmfoow.fsf@dwp.des.no> <20060830202834.GA11284@rambler-co.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="U+BazGySraz5kW0T" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.12-2006-07-14 X-Virus-Scanned: No virus found Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@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 09:59:40 -0000 --U+BazGySraz5kW0T Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 30, 2006 at 08:15:57PM -0400, Garance A Drosehn wrote: > At 12:28 AM +0400 8/31/06, Ruslan Ermilov wrote: > >On Wed, Aug 30, 2006 at 01:41:51PM -0400, Garance A Drosehn wrote: > > > > > ... I wonder if it would be better to > > > have the comments and examples as files under /etc/defaults. I > > > suppose they could also go under /usr/share/examples, but for > > > these files I think there is some advantage that the comments > > > and examples be on '/', and not on '/usr'. > > > > >> Also, if the comment+example files are under /etc/defaults, then > >> changes to them *will* come up in mergemaster. It's just that > >> now they will show up in a file that has no local changes, so > >> the user can just read the change, instead of having to "merge" > > > all their local changes with the new official version. > > > >I think they should be moved to /usr/share/examples/etc/ (like > >make.conf), with files in /etc/ representing good (short) defaults > >with a minimum of comments and probably references to examples. >=20 > Well, my thinking was something like: >=20 > a) these example/comment files are for "system" things. Many > people mount their /usr directories from somewhere else, > thus /usr might not be an exact match for the running kernel. > (note that make.conf makes sense for /usr/share/examples, > because the `make` command is also under /usr). >=20 And having inconsistency between /usr/lib/*.so*, /usr/bin, /usr/libexec, /usr/sbin and a running kernel? :-) /usr if often shared, indeed, but it usually does match the currently running kernel. Heck, why the kernel matters here? I'd say more important that the /usr be consistent with /lib. > 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. >=20 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. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --U+BazGySraz5kW0T Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFE9rMkqRfpzJluFF4RAqPVAJ0eM5QM0Jxpdy0UttfyeVwM7XXiNQCfcjHx 8faijWt6itC0dMKTboPYAH0= =DWuo -----END PGP SIGNATURE----- --U+BazGySraz5kW0T--