From owner-freebsd-stable  Sat Feb 22 14:48:13 2003
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C545E37B401
	for <freebsd-stable@FreeBSD.ORG>; Sat, 22 Feb 2003 14:48:11 -0800 (PST)
Received: from web10501.mail.yahoo.com (web10501.mail.yahoo.com [216.136.130.151])
	by mx1.FreeBSD.org (Postfix) with SMTP id 388C543FB1
	for <freebsd-stable@FreeBSD.ORG>; Sat, 22 Feb 2003 14:48:11 -0800 (PST)
	(envelope-from b_oshea@yahoo.com)
Message-ID: <20030222224811.28252.qmail@web10501.mail.yahoo.com>
Received: from [64.160.47.216] by web10501.mail.yahoo.com via HTTP; Sat, 22 Feb 2003 14:48:11 PST
Date: Sat, 22 Feb 2003 14:48:11 -0800 (PST)
From: Brian O'Shea <b_oshea@yahoo.com>
Subject: Re: STABLE buildworld/buildkernel on 4.5-R apparently worked
To: Peter Wu <peterwu@canada.com>, Kevin Oberman <oberman@es.net>
Cc: Brian O'Shea <b_oshea@yahoo.com>, freebsd-stable@FreeBSD.ORG
In-Reply-To: <86d6lk8yrd.fsf@vanilla.z>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

--- Peter Wu <peterwu@canada.com> wrote:
> "Kevin Oberman" <oberman@es.net> writes:
> 
[...]
> > Yes. Be very sure that you run 'mergemaster -p' before you attempt to
> > install the new system. If you don't, installworld might fail in a
> > very ugly way.
> 
> 4.5-RELEASE does not have a mergemaster that knows -p switch.

I used src/usr.sbin/mergemaster/mergemaster.sh from the cvsup'ed directory
instead and it worked.  In -STABLE, the -p option tells mergemaster to
only compare "crucial files".  The only differences that it reported were
in /etc/master.passwd, /etc/group, and /etc/make.conf (make.conf didn't exist
on my 4.5-RELEASE system; there was only an /etc/defaults/make.conf).

FWIW, the upgrade went cleanly and my system works (except for a panic,
which I reported on this list earlier today but apparently hasn't been
posted yet [???]).

Thanks to all who replied,
-brian


__________________________________________________
Do you Yahoo!?
Yahoo! Tax Center - forms, calculators, tips, more
http://taxes.yahoo.com/

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message