Date: Thu, 07 Oct 2004 16:55:16 -0700 From: Sean McNeil <sean@mcneil.com> To: Doug Barton <DougB@FreeBSD.org> Cc: Ryan Newman <ryannewman47@hotmail.com> Subject: RE: mergemaster just screwed me Message-ID: <1097193316.4224.1.camel@server> In-Reply-To: <20041007164340.E826@bo.vpnaa.bet> References: <BAY15-F22SVMum03yMJ0000281c@hotmail.com> <20041007015527.M6673@alpha.siliconlandmark.com> <1097133252.92555.1.camel@server> <20041007161322.S826@bo.vpnaa.bet> <1097192078.1794.6.camel@server> <20041007164340.E826@bo.vpnaa.bet>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On Thu, 2004-10-07 at 16:47, Doug Barton wrote:
> On Thu, 7 Oct 2004, Sean McNeil wrote:
>
> >> 1. How do you usually invoke mergemaster?
> >> 2. Do you have a .mergemasterrc file?
> >> 3. Do you run a MM_PRE_COMPARE_SCRIPT?
> >> 4. Do you have any *_BIND_* options in /etc/make.conf?
> >> 5. Output of 'ls -la /etc/namedb /var/named/etc/namedb'
> >
> > 1. I invoke by simply typing mergemaster.
> > 2. yes, the contents are:
> >
> > MM_PRE_COMPARE_SCRIPT=/usr/local/bin/mergemaster_precompare
> >
> > 3. The contents of /usr/local/bin/mergemaster_precompare are...
> >
> > #!/bin/sh
> >
> > # NOTE: No PATH needed, because mm's PATH is already draconian enough
> >
> > case "${PRE_WORLD}" in
> > '')
> > rm -f ${TEMPROOT}/etc/motd
> > rm -f ${TEMPROOT}/etc/hosts ${TEMPROOT}/etc/hosts.allow
> > rm -f ${TEMPROOT}/etc/mail/mailer.conf
> > rm -f ${TEMPROOT}/etc/ssl/openssl.cnf
> > rm -f ${TEMPROOT}/etc/namedb/PROTO.*
> > ${TEMPROOT}/etc/namedb/named.* \
> > ${TEMPROOT}/etc/namedb/make-localhost
> > ;;
> > esac
> >
> > ARGH!!!!! That must be it. Deleting them in TEMPROOT causes them to go
> > away in /var/named?
> >
> > Thanks for the insight. Now, is what I did here wrong or is this an
> > issue with the way things are moved around?
>
> Yeah, that's what I was afraid of. The change that happened in version
> 1.334 of src/etc/Makefile symlinked the /etc/namedb in the temproot
> directory to the live directory on the system.
>
> Please try the attached patch and make sure that it works for you, then
> let me know the results.
>
> Doug
The provided patch allows me to use my mergemaster_precompare. Many,
many thanks!
Sean
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (FreeBSD)
iD8DBQBBZddkyQsGN30uGE4RArTCAJsFAtrtr7LwaaeUEQcQlAD1JwfsLQCfSxKy
B4nnPuHgjHmMt6hDPOCKuos=
=oxBm
-----END PGP SIGNATURE-----
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1097193316.4224.1.camel>