From owner-freebsd-current@FreeBSD.ORG Wed Jul 14 19:39:34 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 DC31716A4CE for ; Wed, 14 Jul 2004 19:39:33 +0000 (GMT) Received: from anduin.net (anduin.net [212.12.46.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id A172143D68 for ; Wed, 14 Jul 2004 19:39:33 +0000 (GMT) (envelope-from ltning@anduin.net) Received: from mailnull by anduin.net with spam-scanned (Exim 4.34; FreeBSD) id 1BkpbI-000FB5-3L for freebsd-current@freebsd.org; Wed, 14 Jul 2004 21:39:32 +0200 Received: from [217.8.136.185] (helo=[192.168.1.10]) by anduin.net with esmtp (Exim 4.34; FreeBSD) id 1Bkpb9-000FAe-Td; Wed, 14 Jul 2004 21:39:24 +0200 Message-ID: <40F58BE7.9050601@anduin.net> Date: Wed, 14 Jul 2004 21:39:19 +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> 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 19:39:34 -0000 Garance A Drosihn wrote: > At 11:30 AM +0100 7/14/04, Steve O'Hara-Smith wrote: > >> On Wed, 14 Jul 2004 11:03:10 +0200 >> Michael Nottebrock wrote: >> >> > mergemaster -p needs to happen before installworld, earlier than >> > that is not required. >> >> From man mergemaster: >> >> -p Pre-buildworld mode. Compares only files known to >> be essential to the success of {build|install}world, >> including /etc/make.conf. >> >> I rest my case. > > > 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 > 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 flames .. correct me if I'm wrong (or don't bother, since this is a pretty unimportant point anyway :) /Eirik > > Why? Because we claim to support: > Non-root user, on some machine does: > buildworld > buildkernel > Then go to many different machines, and as root do: > installkernel > mergemaster -p > reboot > installworld > mergemaster > > If `mergemaster -p' is done before *buildworld*, then that implies > it only has to be done once -- even when installing on multiple > machines. > > And the fact of the matter is that any checks which *do* have to > happen before buildworld, are done *in* /usr/src/Makefile by > the target 'upgrade_checks'. mergemaster -p is not needed before > buildworld. > > Also note that in /usr/src/Makefile itself, we explicitly state > that the correct order is: > > # For individuals wanting to upgrade their sources (even if only a > # delta of a few days): > # > # 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' > > In some sense I don't care what the order is, but we should not > be claiming one order in /usr/src/Makefile, and have a different > order implied by the man page for mergemaster. >