From owner-cvs-src@FreeBSD.ORG Sat Oct 9 10:45:48 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 2AAF216A4CE; Sat, 9 Oct 2004 10:45:48 +0000 (GMT) Received: from gw.Awfulhak.org (awfulhak.demon.co.uk [80.177.173.150]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D96943D2D; Sat, 9 Oct 2004 10:45:47 +0000 (GMT) (envelope-from brian@Awfulhak.org) Received: from dev.lan.Awfulhak.org (brian@dev.lan.Awfulhak.org [172.16.0.5]) by gw.Awfulhak.org (8.13.1/8.13.1) with SMTP id i99AjaRR052253; Sat, 9 Oct 2004 11:45:36 +0100 (BST) (envelope-from brian@Awfulhak.org) Date: Sat, 9 Oct 2004 11:45:44 +0100 From: Brian Somers To: Brian Somers Message-ID: <20041009114544.080344bd@dev.lan.Awfulhak.org> In-Reply-To: <20041009011553.01708de1@dev.lan.Awfulhak.org> References: <200410071355.i97DtSJq024575@repoman.freebsd.org> <20041009011553.01708de1@dev.lan.Awfulhak.org> X-Mailer: Sylpheed-Claws 0.9.12b (GTK+ 1.2.10; i386-portbld-freebsd6.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, hits=0.0 required=5.0 tests=none autolearn=no version=2.64 X-Spam-Checker-Version: SpamAssassin 2.64 (2004-01-11) on gw.lan.Awfulhak.org 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 10:45:48 -0000 On Sat, 9 Oct 2004 01:15:53 +0100, Brian Somers wrote: > 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/? Ok, so there doesn't seem to be a huge resistance to this idea. So how about we install this stuff as part of installworld: etc/defaults etc/mtree etc/periodic etc/rc.d the rationalle being that these are owned by the OS and not by the user. Mergemaster can stay the same so that it can offer to delete old stuff. I've worked long and hard on this and attached the hugely complicated patch to the bottom of this email. -- Brian Don't _EVER_ lose your sense of humour ! Index: Makefile.inc1 =================================================================== RCS file: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.448 diff -u -r1.448 Makefile.inc1 --- Makefile.inc1 27 Sep 2004 08:23:42 -0000 1.448 +++ Makefile.inc1 9 Oct 2004 10:43:30 -0000 @@ -64,6 +64,10 @@ .endif SUBDIR+=sys usr.bin usr.sbin etc +# These directories contain system scripts and configuration files +# that should not be changed by the user. +SUBDIR+=etc/defaults etc/mtree etc/periodic etc/rc.d + # These are last, since it is nice to at least get the base system # rebuilt before you do them. .for _DIR in ${LOCAL_DIRS}