From owner-freebsd-current@FreeBSD.ORG Wed Feb 11 10:01:42 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 672AE16A4CE for ; Wed, 11 Feb 2004 10:01:42 -0800 (PST) Received: from rwcrmhc13.comcast.net (rwcrmhc13.comcast.net [204.127.198.39]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60A5543D1F for ; Wed, 11 Feb 2004 10:01:42 -0800 (PST) (envelope-from DougB@freebsd.org) Received: from master.dougb.net (c-24-130-160-161.we.client2.attbi.com[24.130.160.161]) by comcast.net (rwcrmhc13) with SMTP id <2004021118014101500c8rl9e>; Wed, 11 Feb 2004 18:01:41 +0000 Date: Wed, 11 Feb 2004 10:01:40 -0800 (PST) From: Doug Barton To: Richard Todd In-Reply-To: Message-ID: <20040211095906.H793@znfgre.qbhto.arg> References: <400C012E.4040002@mail.ru> <400C0E5F.5010606@potentialtech.com> <20040119221449.W1109@pukruppa.net> Organization: http://www.FreeBSD.org/ X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: "freebsd-current@freebsd.org" Subject: Re: question on mergemaster X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Feb 2004 18:01:42 -0000 Just catching up on some old mail. On Wed, 21 Jan 2004, Richard Todd wrote: > Peter Ulrich Kruppa wrote: > >What about a file "mergemaster_ignore" where I put in the six or > >seven names of files that should never be touched? > > You can do this already with a little fiddling with the .mergemasterrc file. > I have a /root/.mergemasterrc file that looks like this: > ------------------------ > MM_PRE_COMPARE_SCRIPT=/usr/local/bin/mergemaster_precompare > ------------------------ > > MM_PRE_COMPARE_SCRIPT specifies a script that gets run after the temproot > dir gets populated but before mergemaster starts comparing it against the > current /etc contents. My /usr/local/bin/mergemaster_precompare looks like > this: > ------------------------ > #!/bin/sh > cd /var/tmp/temproot > rm etc/master.passwd etc/group etc/ppp/ppp.conf etc/mail/aliases etc/amd.map etc/hosts > ------------------------ > which removes those files from the set of "new" files mergemaster considers > possibly installing. It's nice to see that someone reads the man page. :) I have a pre-compare script that handles both sides of the equation: #!/bin/sh # NOTE: No PATH needed, because mm's PATH is already draconian enough case "${PRE_WORLD}" in '') rm -f /etc/defaults/pccard.conf rm -f ${TEMPROOT}/etc/motd rm -f ${TEMPROOT}/etc/namedb/PROTO.* ${TEMPROOT}/etc/namedb/named.* \ ${TEMPROOT}/etc/namedb/make-localhost ;; esac The first file is deleted from /etc/defaults because I always want to install the new one. The other files are deleted from TEMPROOT because I don't want mm to fiddle with them. HTH, Doug -- This .signature sanitized for your protection