From owner-freebsd-stable  Sun Sep 16 13:56:11 2001
Delivered-To: freebsd-stable@freebsd.org
Received: from tao.org.uk (genius.tao.org.uk [212.135.162.51])
	by hub.freebsd.org (Postfix) with ESMTP id EADCE37B407
	for <freebsd-stable@freebsd.org>; Sun, 16 Sep 2001 13:55:47 -0700 (PDT)
Received: by tao.org.uk (Postfix, from userid 100)
	id DC4A0481; Sun, 16 Sep 2001 21:55:41 +0100 (BST)
Date: Sun, 16 Sep 2001 21:55:41 +0100
From: Josef Karthauser <joe@tao.org.uk>
To: doug@safeport.com
Cc: freebsd-stable@freebsd.org
Subject: Re: mergemaster question
Message-ID: <20010916215541.F23685@tao.org.uk>
Mail-Followup-To: Josef Karthauser <joe@tao.org.uk>,
	doug@safeport.com, freebsd-stable@freebsd.org
References: <Pine.BSF.4.21.0109161557580.7651-100000@pemaquid.safeport.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-md5;
	protocol="application/pgp-signature"; boundary="MZf7D3rAEoQgPanC"
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <Pine.BSF.4.21.0109161557580.7651-100000@pemaquid.safeport.com>; from doug@safeport.com on Sun, Sep 16, 2001 at 04:36:12PM -0400
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG


--MZf7D3rAEoQgPanC
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Sep 16, 2001 at 04:36:12PM -0400, doug@safeport.com wrote:
> I was looking at /var/tmp/temproot after running mergemaster to see what =
was in
> /etc that was not in ..temproot/etc. The only files I could not identify:
>=20
>    pim6dd.conf
>    pim6sd.conf
>=20
> after rooting (no pun) around for a bit I know what they are.
>=20
> My question is, if/when these files change will the process automatically
> include them for merging or should they be listed in=20
> /usr/src/etc/mtree/BSD.root.dist?

They shouldn't be there at all.  pim6Xd was removed to the ports.

Joe

--MZf7D3rAEoQgPanC
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org

iEYEARECAAYFAjulEc0ACgkQXVIcjOaxUBY56gCfQAUU5GNyCNhvWs0JDmJEyzhS
1FQAnAwP/mZkC8UvBecNWnfhQK3w4Tss
=3UNN
-----END PGP SIGNATURE-----

--MZf7D3rAEoQgPanC--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message