From owner-freebsd-current@FreeBSD.ORG Wed Jul 14 21:39:17 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 4C20716A4CE for ; Wed, 14 Jul 2004 21:39:17 +0000 (GMT) Received: from anduin.net (anduin.net [212.12.46.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10BB843D4C for ; Wed, 14 Jul 2004 21:39:17 +0000 (GMT) (envelope-from ltning@anduin.net) Received: from mailnull by anduin.net with spam-scanned (Exim 4.34; FreeBSD) id 1BkrT8-000G8O-Ri for freebsd-current@freebsd.org; Wed, 14 Jul 2004 23:39:16 +0200 Received: from [217.8.136.185] (helo=[192.168.1.10]) by anduin.net with esmtp (Exim 4.34; FreeBSD) id 1BkrT2-000G8D-Sb; Wed, 14 Jul 2004 23:39:09 +0200 Message-ID: <40F5A7F8.8080905@anduin.net> Date: Wed, 14 Jul 2004 23:39:04 +0200 From: Eirik Oeverby User-Agent: Mozilla Thunderbird 0.7.1 (X11/20040711) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Garance A Drosihn References: <25787.1089753241@critter.freebsd.dk> <40F4562D.2020101@linuxpowered.com> <20040714090640.1fe19f2b.steve@sohara.org> <200407141103.10881.michaelnottebrock@gmx.net> <20040714113019.7be536d5.steve@sohara.org> <40F58BE7.9050601@anduin.net> In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on anduin.net X-Spam-Level: X-Spam-Status: No, hits=0.0 required=7.5 tests=none autolearn=no version=2.63 cc: freebsd-current@freebsd.org Subject: Re: CVSUP and 5.2.1 RELEASE 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: Wed, 14 Jul 2004 21:39:17 -0000 Garance A Drosihn wrote: > At 9:39 PM +0200 7/14/04, Eirik Oeverby wrote: > >> Garance A Drosihn wrote: >> >>> >>> Someday we have to clean these instructions up, and make sure we >>> have a short, consistent set of instructions. And that we are >>> saying the same thing everywhere we say anything about updating >>> the system. So far, we have never *needed* `mergemaster -p' >>> before buildworld, and I think it is confusing to tell users it > > ^^^^^^^^^^^ - NOTE > >>> should be done then. >> >> >> This is NOT true. Recently mergemaster -p insisted that I add >> certain users and groups to my passwd/group files, to support >> pf. Without that, I bet installworld would have gone down in > > ^^^^^^^^^^^^ - NOTE > >> flames .. correct me if I'm wrong (or don't bother, since this >> is a pretty unimportant point anyway :) > > > Hmm. I fail to see your point. What I said was: > > "We have never needed `mergemaster -p' before *-BUILDWORLD-*". > Sorry, I apologise - read you wrong there. Still - as far as I understand, the discussion is about make world, which does both, with no mergemaster in between. My comment was aimed at proving that mergemaster *can* be important at times. Again, sorry for reading a bit fast. /Eirik > You then emphatically state that I am wrong, and offer an > example which talks about INSTALLWORLD. Not BUILDWORLD -- > which is what *I* was talking about -- but INSTALLWORLD. > > I don't want to sound like a screaming lunatic here, but I do > think you have missed a very significant detail in what I was > saying. Note that I also quoted /usr/src/Makefile, which says: > >>> # 1. `cd /usr/src' (or to the directory containing your source >>> tree). >>> # 2. `make buildworld' >>> # 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is >>> GENERIC). >>> # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is >>> GENERIC). >>> # 5. `reboot' (in single user mode: boot -s from the loader >>> prompt). >>> # 6. `mergemaster -p' >>> # 7. `make installworld' >>> # 8. `mergemaster' >>> # 9. `reboot' > > > Note that this *does* do mergemaster -p before installworld. Not > before buildworld, but definitely before installworld. Yep. My bad, sorry.