Date: Thu, 7 Oct 2004 16:47:44 -0700 (PDT) From: Doug Barton <DougB@FreeBSD.org> To: Sean McNeil <sean@mcneil.com> Cc: Ryan Newman <ryannewman47@hotmail.com> Subject: RE: mergemaster just screwed me Message-ID: <20041007164340.E826@bo.vpnaa.bet> In-Reply-To: <1097192078.1794.6.camel@server> References: <BAY15-F22SVMum03yMJ0000281c@hotmail.com> <1097133252.92555.1.camel@server> <20041007161322.S826@bo.vpnaa.bet> <1097192078.1794.6.camel@server>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
--0-2113246951-1097192864=:826
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
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
--
This .signature sanitized for your protection
--0-2113246951-1097192864=:826
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="bind9-mtree-fix-2.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <20041007164744.X826@bo.vpnaa.bet>
Content-Description:
Content-Disposition: attachment; filename="bind9-mtree-fix-2.diff"
SW5kZXg6IGV0Yy9NYWtlZmlsZQ0KPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K
UkNTIGZpbGU6IC91c3IvbG9jYWwvbmN2cy9zcmMvZXRjL01ha2VmaWxlLHYN
CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zMzQNCmRpZmYgLXUgLXIxLjMzNCBN
YWtlZmlsZQ0KLS0tIGV0Yy9NYWtlZmlsZQk1IE9jdCAyMDA0IDEzOjAzOjA4
IC0wMDAwCTEuMzM0DQorKysgZXRjL01ha2VmaWxlCTcgT2N0IDIwMDQgMTk6
MjI6NDIgLTAwMDANCkBAIC0xMjIsMTAgKzEyMiwxOCBAQA0KIAkgICAgbG4g
JHtERVNURElSfS9yb290Ly5wcm9maWxlICR7REVTVERJUn0vLnByb2ZpbGUN
CiAJY2QgJHsuQ1VSRElSfS9tdHJlZTsgJHtJTlNUQUxMfSAtbyAke0JJTk9X
Tn0gLWcgJHtCSU5HUlB9IC1tIDQ0NCBcDQogCSAgICAke01UUkVFfSAke0RF
U1RESVJ9L2V0Yy9tdHJlZQ0KLS5pZiAhZGVmaW5lZChOT19CSU5EX0VUQykg
JiYgIWRlZmluZWQoTk9fQklORCkNCisuaWYgIWRlZmluZWQoTk9fQklORCkN
CisuaWYgIWRlZmluZWQoTk9fQklORF9FVEMpDQogCWNkICR7LkNVUkRJUn0v
bmFtZWRiOyAke0lOU1RBTEx9IC1vICR7QklOT1dOfSAtZyAke0JJTkdSUH0g
LW0gNjQ0IFwNCiAJICAgICR7TkFNRURCfSAke0RFU1RESVJ9L3Zhci9uYW1l
ZC9ldGMvbmFtZWRiDQogLmVuZGlmDQorLmlmICFkZWZpbmVkKE5PX0JJTkRf
TVRSRUUpDQorCUBpZiBbICEgLWUgJHtERVNURElSfS9ldGMvbmFtZWRiIF07
IHRoZW4gXA0KKwkJc2V0IC14OyBcDQorCQlsbiAtcyAuLi92YXIvbmFtZWQv
ZXRjL25hbWVkYiAke0RFU1RESVJ9L2V0Yy9uYW1lZGI7IFwNCisJZmkNCisu
ZW5kaWYNCisuZW5kaWYNCiAJY2QgJHsuQ1VSRElSfS9wcHA7ICR7SU5TVEFM
TH0gLW8gJHtCSU5PV059IC1nICR7QklOR1JQfSAtbSA2MDAgXA0KIAkgICAg
JHtQUFBDTkZ9ICR7REVTVERJUn0vZXRjL3BwcA0KIAljZCAkey5DVVJESVJ9
L21haWw7ICR7SU5TVEFMTH0gLW8gJHtCSU5PV059IC1nICR7QklOR1JQfSAt
bSA2NDQgXA0KQEAgLTE4NCw5ICsxOTIsMTAgQEANCiAJbXRyZWUgLWRlVSAk
e01UUkVFX0ZPTExPV1NfU1lNTElOS1N9IC1mICR7LkNVUkRJUn0vbXRyZWUv
QklORC5pbmNsdWRlLmRpc3QgXA0KIAkgICAgLXAgJHtERVNURElSfS91c3Iv
aW5jbHVkZQ0KIC5lbmRpZg0KKy5pZiAhZGVmaW5lZChOT19CSU5EX01UUkVF
KQ0KIAltdHJlZSAtZGVVICR7TVRSRUVfRk9MTE9XU19TWU1MSU5LU30gLWYg
JHsuQ1VSRElSfS9tdHJlZS9CSU5ELmNocm9vdC5kaXN0IFwNCiAJICAgIC1w
ICR7REVTVERJUn0vdmFyL25hbWVkDQotCWxuIC1maHMgL3Zhci9uYW1lZC9l
dGMvbmFtZWRiICR7REVTVERJUn0vZXRjL25hbWVkYg0KKy5lbmRpZg0KIC5l
bmRpZg0KIC5pZiAhZGVmaW5lZChOT19TRU5ETUFJTCkNCiAJbXRyZWUgLWRl
VSAke01UUkVFX0ZPTExPV1NfU1lNTElOS1N9IC1mICR7LkNVUkRJUn0vbXRy
ZWUvQlNELnNlbmRtYWlsLmRpc3QgLXAgJHtERVNURElSfS8NCkluZGV4OiBz
aGFyZS9leGFtcGxlcy9ldGMvbWFrZS5jb25mDQo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09DQpSQ1MgZmlsZTogL3Vzci9sb2NhbC9uY3ZzL3NyYy9zaGFyZS9l
eGFtcGxlcy9ldGMvbWFrZS5jb25mLHYNCnJldHJpZXZpbmcgcmV2aXNpb24g
MS4yMzQNCmRpZmYgLXUgLXIxLjIzNCBtYWtlLmNvbmYNCi0tLSBzaGFyZS9l
eGFtcGxlcy9ldGMvbWFrZS5jb25mCTI3IFNlcCAyMDA0IDA4OjIzOjQyIC0w
MDAwCTEuMjM0DQorKysgc2hhcmUvZXhhbXBsZXMvZXRjL21ha2UuY29uZgk3
IE9jdCAyMDA0IDE5OjI0OjEzIC0wMDAwDQpAQCAtMTQ1LDEwICsxNDUsMTIg
QEANCiAjDQogIyBWYXJpYWJsZXMgdG8gY29udHJvbCB3aGV0aGVyIHBhcnRz
IG9mIHRoZSBiYXNlIEJJTkQgYXJlIGJ1aWx0Lg0KICMgRGVmaW5pbmcgTk9f
QklORCBtYWtlcyBhbGwgb2YgdGhlIGZvbGxvd2luZyBCSU5EIHZhcmlhYmxl
cyBvYnNvbGV0ZS4NCisjIFBsZWFzZSBzZWUgdGhlIG1vcmUgZGV0YWlsZWQg
ZGVzY3JpcHRpb25zIGluIG1ha2UuY29uZig1KS4NCiAjTk9fQklORD0JCXRy
dWUJIyBEbyBub3QgYnVpbGQgYW55IHBhcnQgb2YgQklORA0KICNOT19CSU5E
X0ROU1NFQz0JdHJ1ZQkjIERvIG5vdCBidWlsZCBkbnNzZWMta2V5Z2VuLCBk
bnNzZWMtc2lnbnpvbmUNCiAjTk9fQklORF9FVEM9CQl0cnVlCSMgRG8gbm90
IGluc3RhbGwgZmlsZXMgdG8gL2V0Yy9uYW1lZGINCiAjTk9fQklORF9MSUJT
X0xXUkVTPQl0cnVlCSMgRG8gbm90IGluc3RhbGwgdGhlIGx3cmVzIGxpYnJh
cnkNCisjTk9fQklORF9NVFJFRT0JCXRydWUJIyBEbyBub3QgcnVuIG10cmVl
IHRvIGNyZWF0ZSBjaHJvb3QgZGlyZWN0b3JpZXMNCiAjTk9fQklORF9OQU1F
RD0JCXRydWUJIyBEbyBub3QgYnVpbGQgbmFtZWQsIHJuZGMsIGx3cmVzZCwg
ZXRjLg0KICNOT19CSU5EX1VUSUxTPQkJdHJ1ZQkjIERvIG5vdCBidWlsZCBk
aWcsIGhvc3QsIG5zbG9va3VwLCBuc3VwZGF0ZQ0KICNXSVRIX0JJTkRfTElC
Uz0JdHJ1ZQkjIEluc3RhbGwgdGhlIEJJTkQgbGlicyBhbmQgaW5jbHVkZSBm
aWxlcw0KSW5kZXg6IHNoYXJlL21hbi9tYW41L21ha2UuY29uZi41DQo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL3Vzci9sb2NhbC9uY3Zz
L3NyYy9zaGFyZS9tYW4vbWFuNS9tYWtlLmNvbmYuNSx2DQpyZXRyaWV2aW5n
IHJldmlzaW9uIDEuOTYNCmRpZmYgLXUgLXIxLjk2IG1ha2UuY29uZi41DQot
LS0gc2hhcmUvbWFuL21hbjUvbWFrZS5jb25mLjUJMjcgU2VwIDIwMDQgMDg6
MjM6NDIgLTAwMDAJMS45Ng0KKysrIHNoYXJlL21hbi9tYW41L21ha2UuY29u
Zi41CTUgT2N0IDIwMDQgMjM6NTM6MzMgLTAwMDANCkBAIC0yNCw3ICsyNCw3
IEBADQogLlwiDQogLlwiICRGcmVlQlNEOiBzcmMvc2hhcmUvbWFuL21hbjUv
bWFrZS5jb25mLjUsdiAxLjk2IDIwMDQvMDkvMjcgMDg6MjM6NDIgZG91Z2Ig
RXhwICQNCiAuXCINCi0uRGQgU2VwdGVtYmVyIDI3LCAyMDA0DQorLkRkIE9j
dG9iZXIgNSwgMjAwNA0KIC5EdCBNQUtFLkNPTkYgNQ0KIC5Pcw0KIC5TaCBO
QU1FDQpAQCAtNjEyLDEyICs2MTIsMjMgQEANCiAuSXQgVmEgTk9fQklORF9F
VEMNCiAuUHEgVnQgYm9vbA0KIFNldCB0byBhdm9pZCBpbnN0YWxsaW5nIHRo
ZSBkZWZhdWx0IGZpbGVzIHRvDQotLlBhIC9ldGMvbmFtZWRiIC4NCisuUGEg
L3Zhci9uYW1lZC9ldGMvbmFtZWRiIC4NCiAuSXQgVmEgTk9fQklORF9MSUJT
X0xXUkVTDQogLlBxIFZ0IGJvb2wNCiBTZXQgdG8gYXZvaWQgaW5zdGFsbGlu
ZyB0aGUgbGlnaHR3ZWlnaHQgcmVzb2x2ZXIgbGlicmFyeSBpbg0KIC5QYSAv
dXNyL2xpYiAuDQogVGhlIGxpYnJhcnkgdGhhdCBpcyBwcml2YXRlIHRvIHRo
ZSBidWlsZCBzeXN0ZW0gbWF5IHN0aWxsIGJlIGJ1aWx0IGFzIG5lZWRlZC4N
CisuSXQgVmEgTk9fQklORF9NVFJFRQ0KKy5QcSBWdCBib29sDQorU2V0IHRv
IGF2b2lkIHJ1bm5pbmcNCisuWHIgbXRyZWUgOA0KK3RvIGNyZWF0ZSB0aGUg
Y2hyb290IGRpcmVjdG9yeSBzdHJ1Y3R1cmUgdW5kZXINCisuUGEgL3Zhci9u
YW1lZCAsDQorYW5kIGF2b2lkIGNyZWF0aW5nIGFuDQorLlBhIC9ldGMvbmFt
ZWRiDQorc3ltbGluayB0byB0aGUgY2hyb290IGRpcmVjdG9yeS4NCitUaGlz
IG9wdGlvbiBzaG91bGQgdHlwaWNhbGx5IGJlIHVzZWQgdG9nZXRoZXIgd2l0
aA0KKy5WdCBOT19CSU5EX0VUQyAuDQogLkl0IFZhIE5PX0JJTkRfTkFNRUQN
CiAuUHEgVnQgYm9vbA0KIFNldCB0byBhdm9pZCBidWlsZGluZyBvciBpbnN0
YWxsaW5nDQo=
--0-2113246951-1097192864=:826--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041007164340.E826>