From owner-cvs-src@FreeBSD.ORG Sun Oct 10 02:57:22 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 8091516A4CE; Sun, 10 Oct 2004 02:57:22 +0000 (GMT) Received: from harmony.village.org (rover.village.org [168.103.84.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE3DF43D2D; Sun, 10 Oct 2004 02:57:21 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (harmony.village.org [10.0.0.6]) by harmony.village.org (8.13.1/8.13.1) with ESMTP id i9A2tpMU075615; Sat, 9 Oct 2004 20:55:54 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sat, 09 Oct 2004 20:57:36 -0600 (MDT) Message-Id: <20041009.205736.102124101.imp@bsdimp.com> To: brooks@one-eyed-alien.net From: "M. Warner Losh" In-Reply-To: <20041009002051.GA20265@odin.ac.hmc.edu> References: <200410071355.i97DtSJq024575@repoman.freebsd.org> <20041009011553.01708de1@dev.lan.Awfulhak.org> <20041009002051.GA20265@odin.ac.hmc.edu> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: brian@Awfulhak.org cc: mtm@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: cvs-src@FreeBSD.org Subject: Re: What we keep under /etc 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 02:57:22 -0000 In message: <20041009002051.GA20265@odin.ac.hmc.edu> Brooks Davis writes: : As long as you don't actually modify the scripts you can just do an "rm : /etc/rc.d/*" and run mergemaster with -i. It's a whole lot less painful : that way. rm -rf /etc/rc.d/* /etc/isdn/* /etc/periodic/* /etc/defaults/* mergemaster -i Is what I usually do. However, I'd rather have a regexp of filenames that I can tell mergemaster NOT to merge and to merge everything else. Warner