From owner-freebsd-current@FreeBSD.ORG Wed Jul 14 20:06:25 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 F02F116A4CE for ; Wed, 14 Jul 2004 20:06:24 +0000 (GMT) Received: from mail.gmx.net (pop.gmx.de [213.165.64.20]) by mx1.FreeBSD.org (Postfix) with SMTP id 15D0743D4C for ; Wed, 14 Jul 2004 20:06:24 +0000 (GMT) (envelope-from tomonage2@gmx.de) Received: (qmail 19019 invoked by uid 65534); 14 Jul 2004 20:06:15 -0000 Received: from pD95D05F5.dip.t-dialin.net (EHLO [192.168.0.104]) (217.93.5.245) by mail.gmx.net (mp003) with SMTP; 14 Jul 2004 22:06:15 +0200 X-Authenticated: #7843803 User-Agent: Microsoft-Entourage/11.0.0.040405 Date: Wed, 14 Jul 2004 22:05:10 +0200 From: Jonathan Weiss To: Eirik Oeverby , Garance A Drosihn Message-ID: In-Reply-To: <40F58BE7.9050601@anduin.net> Mime-version: 1.0 Content-type: text/plain; charset="US-ASCII" Content-transfer-encoding: 7bit cc: freebsd-current@freebsd.org Subject: AW: 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 20:06:25 -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 This is true. He is talking of make buildworld, not installworld. > >> >> 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. >> > > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" >