From owner-freebsd-current@FreeBSD.ORG  Sun Jul 18 01:17:59 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 E84EC16A4CE
	for <freebsd-current@FreeBSD.org>;
	Sun, 18 Jul 2004 01:17:59 +0000 (GMT)
Received: from mx.us.army.mil (mxoutdr1.us.army.mil [143.69.242.38])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 89EB643D48
	for <freebsd-current@FreeBSD.org>;
	Sun, 18 Jul 2004 01:17:59 +0000 (GMT)
	(envelope-from jonathan.michael.stewart@us.army.mil)
Received: from mta05.int.dr1.us.army.mil (localhost [127.0.0.1])
 by mailrouter.us.army.mil (AKO MTA - mta05 )
 with ESMTP id <0I10004RTWWSZZ@mta05.int.dr1.us.army.mil> for
 freebsd-current@FreeBSD.org; Sun, 18 Jul 2004 01:17:17 +0000 (GMT)
Received: from [10.70.2.3] (syr-68-175-151-134.twcny.rr.com [68.175.151.134])
 by mailrouter.us.army.mil (AKO MTA - mta05 )
 with ESMTPA id <0I1000FEVWWSM9@mta05.int.dr1.us.army.mil> for
 freebsd-current@FreeBSD.org; Sun, 18 Jul 2004 01:17:16 +0000 (GMT)
Date: Sat, 17 Jul 2004 21:17:15 -0400
From: Jonathan <jonathan.michael.stewart@us.army.mil>
In-reply-to: <20040714113019.7be536d5.steve@sohara.org>
To: freebsd-current@FreeBSD.org
Message-id: <40F9CF9B.4020408@us.army.mil>
MIME-version: 1.0
Content-type: text/plain; format=flowed; charset=us-ascii
Content-transfer-encoding: 7BIT
X-Accept-Language: en-us, en
User-Agent: Mozilla Thunderbird 0.7 (Windows/20040616)
References: <25787.1089753241@critter.freebsd.dk>
	<20040714090640.1fe19f2b.steve@sohara.org>
	<200407141103.10881.michaelnottebrock@gmx.net>
	<20040714113019.7be536d5.steve@sohara.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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jul 2004 01:18:00 -0000

Steve O'Hara-Smith wrote:
> On Wed, 14 Jul 2004 11:03:10 +0200 Michael Nottebrock
> <michaelnottebrock@gmx.net> 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
> essen- tial to the success of {build|install}world, including 
> /etc/make.conf.
> 
> I rest my case.
> 
Shouldn't the handbook be fixed then? The handbook says mergemaster -p 
should be preformed AFTER the reboot...
http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html

To update your system, you should use the following procedure:

# make buildworld
# make buildkernel
# make installkernel
# reboot

You should boot in single user mode (using boot -s from loader prompt
for example). Then run:

# mergemaster -p
# make installworld
# mergemaster
# reboot

> 
>>> A mount -a or thereabouts is usually needed here.
>> 
>> No, you don't need to try and mount your nfs, linux, windows and
>> smb filesystems. :)
> 
> 
> Hence the "or thereabouts" - you may well need the NFS filesystem if
> /usr/src is on NFS.
>