From owner-freebsd-stable Thu Mar 11 14:48:37 1999 Delivered-To: freebsd-stable@freebsd.org Received: from awfulhak.org (awfulhak.force9.co.uk [195.166.136.63]) by hub.freebsd.org (Postfix) with ESMTP id 7CB7A1525F; Thu, 11 Mar 1999 14:48:26 -0800 (PST) (envelope-from brian@Awfulhak.org) Received: from keep.lan.Awfulhak.org (keep.lan.Awfulhak.org [172.16.0.8]) by awfulhak.org (8.9.2/8.8.8) with ESMTP id WAA15822; Thu, 11 Mar 1999 22:48:04 GMT (envelope-from brian@Awfulhak.org) Received: from keep.lan.Awfulhak.org (localhost [127.0.0.1]) by keep.lan.Awfulhak.org (8.9.3/8.9.3) with ESMTP id WAA01722; Thu, 11 Mar 1999 22:47:34 GMT (envelope-from brian@keep.lan.Awfulhak.org) Message-Id: <199903112247.WAA01722@keep.lan.Awfulhak.org> X-Mailer: exmh version 2.0.2 2/24/98 To: John Polstra Cc: Brian Somers , freebsd-stable@FreeBSD.org, peter@FreeBSD.org Subject: Re: rc.network->rc.firewall->natd In-reply-to: Your message of "Thu, 11 Mar 1999 11:13:48 PST." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 11 Mar 1999 22:47:34 +0000 From: Brian Somers Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Ok, I understand all that - thanks. There are lots of libalias/natd changes that haven't been brought back into RELENG_3 yet, so I'll sit on them for a few weeks more and do the RELENG_3 ``cvs add'' at that point. I'd tend not to update RELENG_3 at all, but I suspect that'd cause too much confusion with the rc.conf stuff :-( > Brian Somers wrote: > >> > Any chance of a repository copy of src/usr.sbin/natd to src/sbin/natd > >> > (peter & jdp cc'd) ? If it's moved, I'll shift the loading. > >> > >> Sorry, I won't have time to do it until next week. Maybe Peter will > >> have time sooner than that. If next week comes along and it hasn't > >> been done yet, give me a holler. > > > > Any chance of doing this now ? The rc files don't use a full path > > name, so it shouldn't cause any problems at all. > > OK, I'll do the repository copy later today, and let you know when > it's done. Once the copy has been made, you should fix up the > Makefiles, etc., and "cvs rm" the files from "src/usr.sbin/natd" on > the main branch. > > > It's probably best to do it for all branches rather than just for > > -current. > > The way it works with a repository copy is that we remove the tags > first. So the new copy will spring into existence in -current > only. If you want the move to affect other branches, you have to > manually "cvs add" it on those branches. I'll give you more specific > instructions if/when you're ready. The goal here is not to rewrite > history; i.e., no retroactive changes are allowed. > > But it shouldn't be done except in -current for at least a week or > two. Current is for working out any unforseen problems first. After > it's been proven OK in -current, then you could put it into RELENG_3. > I don't think you should touch it in any of the other branches. > > John > --- > John Polstra jdp@polstra.com > John D. Polstra & Co., Inc. Seattle, Washington USA > "Self-interest is the aphrodisiac of belief." -- James V. DeLong > > -- Brian Don't _EVER_ lose your sense of humour ! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message