From owner-freebsd-questions@FreeBSD.ORG  Thu Jun 23 22:43:45 2005
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
X-Original-To: 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 68D2A16A41C;
	Thu, 23 Jun 2005 22:43:45 +0000 (GMT)
	(envelope-from bkoenig@cs.tu-berlin.de)
Received: from mail.efacilitas.de (efacilitas.de [213.133.110.227])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 107AF43D1F;
	Thu, 23 Jun 2005 22:43:45 +0000 (GMT)
	(envelope-from bkoenig@cs.tu-berlin.de)
Received: from eurystheus.local (port-212-202-169-37.dynamic.qsc.de
	[212.202.169.37])
	by mail.efacilitas.de (Postfix) with ESMTP id 4F5081239E8;
	Fri, 24 Jun 2005 00:42:04 +0200 (CEST)
Received: from localhost (eurystheus.local [192.168.1.67])
	by eurystheus.local (Postfix) with ESMTP id EFE3C12B104;
	Fri, 24 Jun 2005 00:42:16 +0200 (CEST)
Received: from eurystheus.local ([192.168.1.67])
	by localhost (eurystheus.locaL [192.168.1.67]) (amavisd-new, port 10024)
	with ESMTP id 56053-04; Fri, 24 Jun 2005 00:42:09 +0200 (CEST)
Received: from [192.168.1.67] (eurystheus.local [192.168.1.67])
	by eurystheus.local (Postfix) with ESMTP id 734FF12B02A;
	Fri, 24 Jun 2005 00:42:09 +0200 (CEST)
Message-ID: <42BB3AC0.7000408@cs.tu-berlin.de>
Date: Fri, 24 Jun 2005 00:42:08 +0200
From: =?ISO-8859-1?Q?Bj=F6rn_K=F6nig?= <bkoenig@cs.tu-berlin.de>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.8) Gecko/20050517
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: freebsd-questions@freebsd.org
References: <42BB0C22.6010000@webexc.com> <42BB1559.6010604@cs.tu-berlin.de>
	<20050623215056.GC14105@keyslapper.net>
In-Reply-To: <20050623215056.GC14105@keyslapper.net>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
X-Virus-Scanned: amavisd-new at example.com
Cc: dougb@freebsd.org
Subject: Re: Help, I killed my machine.
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 23 Jun 2005 22:43:45 -0000

Louis LeBlanc wrote:

> On 06/23/05 10:02 PM, Björn König sat at the `puter and typed:
> 
>>The -p stands for "pre-buildworld mode", i.e. you should run it before 
>>buildworld. ;-)
> 
> Uh, careful.  My copy of the FreeBSD handbook
> (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html)
> says to do it this way:
> 
> # make buildworld
> # make buildkernel
> # make installkernel
> # reboot
> 
> [...]
> 
> After installkernel finishes successfully, you should boot in single
> user mode (i.e. using boot -s from the loader prompt). Then run:
> 
> # mergemaster -p
> # make installworld
> # mergemaster
> # reboot

Indeed.

I read the mergemaster script partially and deceided that it won't hurt 
to run 'mergemaster -p' before 'make buildworld'; and I think that this 
way is the intention of the author of mergemaster too. If I'm mistaken 
then somebody should state the description in mergemaster(8) more 
precisely. I think it is confusing to call it 'pre-buildworld mode' if 
it would be better to execute this command after 'make buildworld' in 
general. I prefer looking into manpages than into the handbook.


Björn

P.S.: I CC'd Doug Barton who wrote most parts of mergemaster.