From owner-freebsd-current@FreeBSD.ORG Thu Oct 7 23:55:19 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7571A16A4CE; Thu, 7 Oct 2004 23:55:19 +0000 (GMT) Received: from mail.mcneil.com (mcneil.com [24.199.45.54]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BB9143D3F; Thu, 7 Oct 2004 23:55:19 +0000 (GMT) (envelope-from sean@mcneil.com) Received: from localhost (localhost.mcneil.com [127.0.0.1]) by mail.mcneil.com (Postfix) with ESMTP id E077CF1907; Thu, 7 Oct 2004 16:55:16 -0700 (PDT) Received: from mail.mcneil.com ([127.0.0.1]) by localhost (server.mcneil.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 04091-01; Thu, 7 Oct 2004 16:55:16 -0700 (PDT) Received: from [24.199.45.54] (mcneil.com [24.199.45.54]) by mail.mcneil.com (Postfix) with ESMTP id 4C647F189E; Thu, 7 Oct 2004 16:55:16 -0700 (PDT) From: Sean McNeil To: Doug Barton In-Reply-To: <20041007164340.E826@bo.vpnaa.bet> References: <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> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-PeIZJ4yA/91XJDOB0GD5" Message-Id: <1097193316.4224.1.camel@server> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 Date: Thu, 07 Oct 2004 16:55:16 -0700 X-Virus-Scanned: by amavisd-new at mcneil.com cc: freebsd-current@freebsd.org cc: Ryan Newman Subject: RE: mergemaster just screwed me X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Oct 2004 23:55:19 -0000 --=-PeIZJ4yA/91XJDOB0GD5 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Thu, 2004-10-07 at 16:47, Doug Barton wrote: > On Thu, 7 Oct 2004, Sean McNeil wrote: >=20 > >> 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=3D/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? >=20 > Yeah, that's what I was afraid of. The change that happened in version=20 > 1.334 of src/etc/Makefile symlinked the /etc/namedb in the temproot=20 > directory to the live directory on the system. >=20 > Please try the attached patch and make sure that it works for you, then=20 > let me know the results. >=20 > Doug The provided patch allows me to use my mergemaster_precompare. Many, many thanks! Sean --=-PeIZJ4yA/91XJDOB0GD5 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQBBZddkyQsGN30uGE4RArTCAJsFAtrtr7LwaaeUEQcQlAD1JwfsLQCfSxKy B4nnPuHgjHmMt6hDPOCKuos= =oxBm -----END PGP SIGNATURE----- --=-PeIZJ4yA/91XJDOB0GD5--