From owner-freebsd-questions@FreeBSD.ORG  Mon Mar 13 17:37:48 2006
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 B7C0D16A401
	for <freebsd-questions@freebsd.org>;
	Mon, 13 Mar 2006 17:37:48 +0000 (UTC)
	(envelope-from bsd@bathnetworks.com)
Received: from lmail.bathnetworks.co.uk (mail.bathnetworks.com [84.92.24.252])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BC76043D53
	for <freebsd-questions@freebsd.org>;
	Mon, 13 Mar 2006 17:37:46 +0000 (GMT)
	(envelope-from bsd@bathnetworks.com)
Received: (qmail 30653 invoked by uid 510); 13 Mar 2006 17:41:49 +0000
Received: from 127.0.0.1 by lmail.bathnetworks.co.uk (envelope-from
	<bsd@bathnetworks.com>, uid 508) with qmail-scanner-1.24-st-qms 
	(clamdscan: 0.88/1261. spamassassin: 3.0.2. perlscan: 1.24-st-qms.  
	Clear:RC:0(127.0.0.1):SA:0(-3.6/5.0):. 
	Processed in 4.612807 secs); 13 Mar 2006 17:41:49 -0000
X-Spam-Status: No, hits=-3.6 required=5.0
X-Antivirus-MYDOMAIN-Mail-From: bsd@bathnetworks.com via
	lmail.bathnetworks.co.uk
X-Antivirus-MYDOMAIN: 1.24-st-qms (Clear:RC:0(127.0.0.1):SA:0(-3.6/5.0):.
	Processed in 4.612807 secs Process 30644)
Received: from localhost (HELO 192.168.0.50) (bsd@bathnetworks.com@127.0.0.1)
	by lmail.bathnetworks.co.uk with SMTP; 13 Mar 2006 17:41:44 +0000
Received: from 192.168.0.107
	(SquirrelMail authenticated user bsd@bathnetworks.com)
	by 192.168.0.50 with HTTP; Mon, 13 Mar 2006 17:41:44 -0000 (GMT)
Message-ID: <1252.192.168.0.107.1142271704.squirrel@192.168.0.50>
In-Reply-To: <20060313085042.18733.qmail@web60021.mail.yahoo.com>
References: <4415312A.4000608@locolomo.org>
	<20060313085042.18733.qmail@web60021.mail.yahoo.com>
Date: Mon, 13 Mar 2006 17:41:44 -0000 (GMT)
From: bsd@bathnetworks.com
To: "Peter" <petermatulis@yahoo.ca>
User-Agent: SquirrelMail/1.4.4
MIME-Version: 1.0
Content-Type: text/plain;charset=iso-8859-1
Content-Transfer-Encoding: 8bit
X-Priority: 3 (Normal)
Importance: Normal
Cc: freebsd-questions <freebsd-questions@freebsd.org>
Subject: Re: where is mergemaster?
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: Mon, 13 Mar 2006 17:37:48 -0000

>
> --- Erik Norgaard <norgaard@locolomo.org> wrote:
>
>> Peter wrote:
>> > Where can I find mergemaster?  I would like to upgrade my box.
>>
>> It should be in your path, but I have also had problems with my path
>> not
>> being set correctly in single user mode.
>
> That was exactly the problem.  I realized this when someone responded
> about it being at /sbin/mergemaster.
>

According to the manual this should work after rebooting with the -s option:

# fsck -p
# mount -u /
# mount -a -t ufs
# swapon -a

Rob