Date: Wed, 11 Feb 2004 10:01:40 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Richard Todd <rmtodd@servalan.servalan.com> Cc: "freebsd-current@freebsd.org" <freebsd-current@freebsd.org> Subject: Re: question on mergemaster Message-ID: <20040211095906.H793@znfgre.qbhto.arg> In-Reply-To: <E1AjRin-000PJf-8o@servalan.servalan.com> References: <400C012E.4040002@mail.ru> <400C0E5F.5010606@potentialtech.com> <20040119221449.W1109@pukruppa.net> <E1AjRin-000PJf-8o@servalan.servalan.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040211095906.H793>