From owner-cvs-all@FreeBSD.ORG Sun Oct 10 10:34:22 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37EFF16A4CE; Sun, 10 Oct 2004 10:34:22 +0000 (GMT) Received: from aiolos.otenet.gr (aiolos.otenet.gr [195.170.0.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B06F43D31; Sun, 10 Oct 2004 10:34:21 +0000 (GMT) (envelope-from keramida@freebsd.org) Received: from gothmog.gr (patr530-a056.otenet.gr [212.205.215.56]) i9AAYH98025301; Sun, 10 Oct 2004 13:34:18 +0300 Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.13.1/8.13.1) with ESMTP id i9AAYCSj072410; Sun, 10 Oct 2004 13:34:12 +0300 (EEST) (envelope-from keramida@freebsd.org) Received: (from giorgos@localhost) by gothmog.gr (8.13.1/8.13.1/Submit) id i9AAVqGm069970; Sun, 10 Oct 2004 13:31:52 +0300 (EEST) (envelope-from keramida@freebsd.org) Date: Sun, 10 Oct 2004 13:31:52 +0300 From: Giorgos Keramidas To: Makoto Matsushita Message-ID: <20041010103151.GA47927@gothmog.gr> References: <20041009114544.080344bd@dev.lan.Awfulhak.org> <20041009222726U.matusita@jp.FreeBSD.org> <20041009184627.26e9a57f@dev.lan.Awfulhak.org> <20041010031208L.matusita@jp.FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041010031208L.matusita@jp.FreeBSD.org> cc: brian@Awfulhak.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org 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-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Oct 2004 10:34:22 -0000 On 2004-10-10 03:12, Makoto Matsushita wrote: > brian> Ok, so etc/mtree can be left out. What about etc/periodic and etc/rc.d? > [...] > If there's a chance that users may modify /etc files, "overriding /etc > files silently" should be avoided as we can, IMHO. 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: a. If MM_OVERWRITE_SUBDIRS is set, set a list of subdirs that will be overwritten by mergemaster to its value. b. If -f option was used replace the subdirs list with its value. c. Before comparing files, do a blind copy of all the files in the list of subdirs that should be overwritten. This would make it relatively easy for people who keep their rc.d, periodic, defaults, isdn and other /etc subdirectories untouched to quickly skip parts of /etc when running mergemaster, but also allow local customizations to be kept safe from the blind copying of files.