From owner-cvs-src@FreeBSD.ORG Sat Oct 9 00:35:02 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 3F81416A4CE; Sat, 9 Oct 2004 00:35:02 +0000 (GMT) Received: from blackwater.lemis.com (wantadilla.lemis.com [192.109.197.135]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2DB843D62; Sat, 9 Oct 2004 00:35:00 +0000 (GMT) (envelope-from grog@lemis.com) Received: by blackwater.lemis.com (Postfix, from userid 1004) id 48CE48560D; Sat, 9 Oct 2004 10:04:58 +0930 (CST) Date: Sat, 9 Oct 2004 10:04:58 +0930 From: Greg 'groggy' Lehey To: Brian Somers Message-ID: <20041009003458.GI94953@wantadilla.lemis.com> References: <200410071355.i97DtSJq024575@repoman.freebsd.org> <20041009011553.01708de1@dev.lan.Awfulhak.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="IbA9xpzOQlG26JSn" Content-Disposition: inline In-Reply-To: <20041009011553.01708de1@dev.lan.Awfulhak.org> User-Agent: Mutt/1.4.2.1i Organization: The FreeBSD Project Phone: +61-8-8388-8286 Fax: +61-8-8388-8725 Mobile: +61-418-838-708 WWW-Home-Page: http://www.FreeBSD.org/ X-PGP-Fingerprint: 9A1B 8202 BCCE B846 F92F 09AC 22E6 F290 507A 4223 cc: cvs-src@FreeBSD.org cc: Mike Makonnen cc: src-committers@FreeBSD.org cc: cvs-all@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: Sat, 09 Oct 2004 00:35:02 -0000 --IbA9xpzOQlG26JSn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Saturday, 9 October 2004 at 1:15:53 +0100, Brian Somers wrote: > On Thu, 7 Oct 2004 13:55:28 +0000 (UTC), Mike Makonnen wrote: >> mtm 2004-10-07 13:55:28 UTC >> >> FreeBSD src repository >> >> Modified files: >> etc rc rc.shutdown >> etc/rc.d DAEMON LOGIN NETWORKING SERVERS abi >> ... > > This makes life painful enough to ask.... > > Is there any good reason that mergemaster deals with this stuff rather than > make installworld? Or maybe I should ask, why doesn't make installworld > handle *some* stuff in /etc, such as /etc/rc.d/ and /etc/defaults/? Arguably, it should handle it all. There's no reason why it shouldn't invoke mergemaster, but the control should be given to 'make install'. Years ago, one of our claims to fame was that we could upgrade the system with a 'make world'. That's never been quite correct, but I think we should be moving towards making it more correct, not less correct. FWIW, I've been experimenting in this area. I have some success, but nothing to write home about yet. Greg -- See complete headers for address and phone numbers. --IbA9xpzOQlG26JSn Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBZzIyIubykFB6QiMRAsx1AJwJgzP59TnZI08TgrU4XaxmCaJexgCfRnN3 oInX7RJ5HlFsFCJTs5dp/4Q= =JWyT -----END PGP SIGNATURE----- --IbA9xpzOQlG26JSn--