From owner-cvs-src@FreeBSD.ORG Sun Oct 10 23:45:32 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 C684916A4CE; Sun, 10 Oct 2004 23:45:32 +0000 (GMT) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1ABC743D31; Sun, 10 Oct 2004 23:45:29 +0000 (GMT) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.gsoft.com.au (localhost [127.0.0.1]) (authenticated bits=0) by cain.gsoft.com.au (8.12.11/8.12.10) with ESMTP id i9ANiPLS072874; Mon, 11 Oct 2004 09:14:25 +0930 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: cvs-all@freebsd.org Date: Mon, 11 Oct 2004 09:14:23 +0930 User-Agent: KMail/1.7 References: <20041009114544.080344bd@dev.lan.Awfulhak.org> <20041010031208L.matusita@jp.FreeBSD.org> <20041010103151.GA47927@gothmog.gr> In-Reply-To: <20041010103151.GA47927@gothmog.gr> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2250060.DjpjjztTTW"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200410110914.24398.doconnor@gsoft.com.au> X-Spam-Score: -2.2 () IN_REP_TO,MIME_LONG_LINE_QP,PGP_SIGNATURE_2,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_00_01,USER_AGENT X-Scanned-By: MIMEDefang 2.16 (www . roaringpenguin . com / mimedefang) cc: Makoto Matsushita cc: brian@awfulhak.org cc: src-committers@freebsd.org cc: Giorgos Keramidas 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 23:45:32 -0000 --nextPart2250060.DjpjjztTTW Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sun, 10 Oct 2004 20:01, Giorgos Keramidas wrote: > 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, i.e.: > > # mergemaster -f "rc.d periodic defaults isdn" > > To avoid having to type manually the list of directories, this could also > be made optional based on an environment variable like > MM_OVERWRITE_SUBDIRS, in which case the order of precedence would be: Or import etcmerge :) etcmerge isn't perfect, but I think effort would be better expended making = it=20 more user friendly (I'm thinking specifically of guiding the user through=20 things more explicitly) =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --nextPart2250060.DjpjjztTTW Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQBBaclY5ZPcIHs/zowRAtWeAJ9gwWbMu5Jemo4/KoyNfEi8K1Cl7gCghT58 Qha6K9HWMS9LS30yQ8cGMb0= =F9Ni -----END PGP SIGNATURE----- --nextPart2250060.DjpjjztTTW--