Date: Wed, 21 Jan 2004 17:25:17 -0600 From: Richard Todd <rmtodd@servalan.servalan.com> To: freebsd-current@freebsd.org Subject: Re: question on mergemaster Message-ID: <E1AjRin-000PJf-8o@servalan.servalan.com> References: <400C012E.4040002@mail.ru> <400C0E5F.5010606@potentialtech.com> <20040119221449.W1109@pukruppa.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1AjRin-000PJf-8o>