From owner-freebsd-questions@FreeBSD.ORG  Tue Nov  2 17:19:08 2004
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2341716A4CE
	for <questions@freebsd.org>; Tue,  2 Nov 2004 17:19:08 +0000 (GMT)
Received: from sccimhc92.asp.att.net (sccimhc92.asp.att.net [63.240.76.166])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D385443D62
	for <questions@freebsd.org>; Tue,  2 Nov 2004 17:19:07 +0000 (GMT)
	(envelope-from freebsd@nbritton.org)
Received: from nbritton.org
	(12-223-129-46.client.insightbb.com[12.223.129.46])
	by sccimhc92.asp.att.net (sccimhc92) with SMTP
	id <20041102171906i9200onjoie>; Tue, 2 Nov 2004 17:19:07 +0000
Message-ID: <4187C18A.7010606@nbritton.org>
Date: Tue, 02 Nov 2004 11:19:06 -0600
From: Nikolas Britton <freebsd@nbritton.org>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US;
	rv:1.4) Gecko/20030624
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Erik Norgaard <norgaard@locolomo.org>
References: <4187A696.9020806@locolomo.org> <4187B9C8.2010904@nbritton.org>
In-Reply-To: <4187B9C8.2010904@nbritton.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
cc: questions@freebsd.org
Subject: Re: mergemaster fails in single user mode
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>,
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>,
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Nov 2004 17:19:08 -0000

For the sake of clarity and completeness here is a better step by step 
guide for upgrading from src:

0: % su
1: # cvsup -g -L 2 foobar-supfile
2: # cd /usr/src
3: # make buildworld && make buildkernel && make installkernel
4: # reboot
5: Login as root (multi-user mode).
6: Breifly test your new Kernel.
7: # shutdown now
8: Hit the Enter Key.
9: # cd /usr/src
10: # make installworld
11: # reboot
12: login as root (multi-user mode).
13: # mergemaster
14: # shutdown now
15: Hit the Enter Key.
16: # exit