From owner-freebsd-stable@FreeBSD.ORG Sat Jan 7 10:24:29 2012 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA8771065673 for ; Sat, 7 Jan 2012 10:24:29 +0000 (UTC) (envelope-from vrachil@gmail.com) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id 582EA8FC1C for ; Sat, 7 Jan 2012 10:24:28 +0000 (UTC) Received: by eekc50 with SMTP id c50so1748599eek.13 for ; Sat, 07 Jan 2012 02:24:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=Fi/7WbzrK0HHQ+MS4bwnKFu1DU4Ff/0p+hjNQIpUu1U=; b=CgIUrfEa5jX6JX5Ge4bk9RbKMhwDHvLkEzGDr4LPnsreaMnD/dBrpZ/inqEMo1vQUk 842vOAqRf5oXLje5IvDjG3uqrhRMGyIwGOqXVT0HckLZEJ5H+8buNkMNgXrzqIbEgFxV 3wVF/AlPPd+s743fJYR6fy7/LW7Kr7YGQ7Br4= Received: by 10.213.4.16 with SMTP id 16mr1818765ebp.93.1325930125808; Sat, 07 Jan 2012 01:55:25 -0800 (PST) Received: from 8.8.8.8 (188.4.52.88.dsl.dyn.forthnet.gr. [188.4.52.88]) by mx.google.com with ESMTPS id e12sm108987796eea.5.2012.01.07.01.55.24 (version=SSLv3 cipher=OTHER); Sat, 07 Jan 2012 01:55:24 -0800 (PST) Message-ID: <4F08168B.7070803@gmail.com> Date: Sat, 07 Jan 2012 11:55:23 +0200 From: Vrachnis Ilias-Dimitrios User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20111228 Thunderbird/9.0 MIME-Version: 1.0 To: freebsd-stable@freebsd.org References: <4F07F0BC.7060309@ish.com.au> In-Reply-To: <4F07F0BC.7060309@ish.com.au> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: freebsd-update problems X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2012 10:24:29 -0000 On 01/07/2012 09:14, Aristedes Maniatis wrote: > [...] > > 2. I didn't touch mergemaster.mtree manually. Well, I don't think I did. > But even if I had, could the tool give me some clue as to how to proceed > from here? Do I now have to go back to csup to update my system and > never be able to use freebsd-update again? Is there a trick to fool > freebsd-update into overwriting this file which I don't think I touched? > > It would be nice if freebsd-update could be more helpful about what the > user should do next when it finds an error. > > > > Thanks > Ari > uname only reports the kernel info. I don't remember if the p6-8 updates touched anything in the kernel, so the kernel probably wasn't rebuilt. You can check in the file /usr/src/sys/conf/newvers.sh, there is a variable named BRANCH. That should tell you which was your last update. Regards, -vid