Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Jan 2004 17:16:06 +0100 (CET)
From:      Peter Ulrich Kruppa <root@pukruppa.de>
To:        Richard Todd <rmtodd@servalan.servalan.com>
Cc:        freebsd-current@freebsd.org
Subject:   Re: question on mergemaster
Message-ID:  <20040122171002.O1074@pukruppa.net>
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
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.
Ah, yes I see.
Which options do you append to
# mergemaster
then?
I cannot find anything like "install everything without asking" in
the manpage.

Regards,

Uli.


	+---------------------------+
	|    Peter Ulrich Kruppa    |
        |         Wuppertal         |
        |          Germany          |
        +---------------------------+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040122171002.O1074>