From owner-freebsd-hackers Fri Jul 20 16:35:38 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by hub.freebsd.org (Postfix) with ESMTP id 4AF5437B405; Fri, 20 Jul 2001 16:35:32 -0700 (PDT) (envelope-from brdavis@odin.ac.hmc.edu) Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.11.0/8.11.0) id f6KNZTH17835; Fri, 20 Jul 2001 16:35:29 -0700 Date: Fri, 20 Jul 2001 16:35:29 -0700 From: Brooks Davis To: Brian Somers Cc: net@FreeBSD.ORG, hackers@FreeBSD.ORG Subject: Re: interface cloning MFC Message-ID: <20010720163529.A16952@Odin.AC.HMC.Edu> References: <200107202329.f6KNTDg17187@hak.lan.Awfulhak.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="fUYQa+Pmc3FrFX/N" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200107202329.f6KNTDg17187@hak.lan.Awfulhak.org>; from brian@Awfulhak.org on Sat, Jul 21, 2001 at 12:29:13AM +0100 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --fUYQa+Pmc3FrFX/N Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jul 21, 2001 at 12:29:13AM +0100, Brian Somers wrote: > This works nicely on my -stale box. Thanks. >=20 > One niggle though :) It's probably worth changing=20 > ``$FreeBSD: ........$'' to ``$FreeBSD$'' in your patched version. =20 > Without this, mergemaster assumes that the new version in /usr/src/etc=20 > is the same as the /etc version (same Ids). This caused a problem=20 > here, I fixed the problem and went to prepare a patch for you.... the=20 > patch file came up empty -- you already had the missing ``create'' in=20 > your patches (of course) :*D I've updated the patch again. I'd run into that problem but didn't think to just unexpand the $FreeBSD$ and then promptly forgot about it. Thanks, Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --fUYQa+Pmc3FrFX/N Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE7WMBAXY6L6fI4GtQRArnqAKDPTEYpw1WAqplg9RkswXuCEzm/MgCg3FEo Bc8amOhnFtHbb7FSrSujYiM= =OVqW -----END PGP SIGNATURE----- --fUYQa+Pmc3FrFX/N-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message