From owner-freebsd-questions@freebsd.org  Wed Nov 16 00:01:43 2016
Return-Path: <owner-freebsd-questions@freebsd.org>
Delivered-To: freebsd-questions@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3670C43F8E
 for <freebsd-questions@mailman.ysv.freebsd.org>;
 Wed, 16 Nov 2016 00:01:43 +0000 (UTC)
 (envelope-from chris@stankevitz.com)
Received: from mango.stankevitz.com (mango.stankevitz.com [208.79.93.194])
 by mx1.freebsd.org (Postfix) with ESMTP id D44A913AA
 for <freebsd-questions@freebsd.org>; Wed, 16 Nov 2016 00:01:43 +0000 (UTC)
 (envelope-from chris@stankevitz.com)
Received: from Chriss-MacBook-Pro.local (209-203-101-124.static.twtelecom.net
 [209.203.101.124])
 by mango.stankevitz.com (Postfix) with ESMTPSA id C00673C3AC;
 Tue, 15 Nov 2016 16:01:42 -0800 (PST)
Subject: Re: Building world vs freebsd-update: merging files
To: CyberLeo Kitsana <cyberleo@cyberleo.net>,
 FreeBSD Questions <freebsd-questions@freebsd.org>
References: <6d78a3d4-e1bd-a640-d395-6d809b0069f9@stankevitz.com>
 <6b6b7079-9cb1-da69-3099-2e418123f8ea@cyberleo.net>
From: Chris Stankevitz <chris@stankevitz.com>
Message-ID: <4562874c-79b1-72fb-fb6b-1b1fb79e9a5c@stankevitz.com>
Date: Tue, 15 Nov 2016 16:01:41 -0800
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:45.0)
 Gecko/20100101 Thunderbird/45.4.0
MIME-Version: 1.0
In-Reply-To: <6b6b7079-9cb1-da69-3099-2e418123f8ea@cyberleo.net>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Nov 2016 00:01:44 -0000

On 11/15/16 2:15 PM, CyberLeo Kitsana wrote:
> On 11/15/2016 12:03 PM, Chris Stankevitz wrote:
>>
>> When using mergemaster during buildworld/installworld, I am asked to
>> merge many files.
>>
>> When using freebsd-update, I am never asked to merge any files.
>>
>> Why the discrepancy?
>
> What flags do you pass to mergemaster while installing world?
>
> I usually use mergemaster -iFU - the caveat being that this requires an
> mtree database to be maintained for it to detect changes to files, and
> this database is only built and maintained when you use the -U flag.
>
> Presumably, freebsd-update does similar automatically, and that's why it
> never asks. Or maybe it just overwrites your local changes? I've only
> ever used installworld, and freebsd-update(8) doesn't mention anything
> about locally modified files.

Hi Leo,

I follow the handbook [1] when building/installing world:

   after installkerernel/reboot: mergemaster -p

   after installworld: mergemaster -iF

This process asks about updating configuration files (including 
/etc/passwd which attempts to reset the root password).

As I mentioned in my original message (and as I'm sure you no doubt 
experience) freebsd-update does not pester about files.

I need to look into the "mtree" method -- which I've never heard of before.

Thank you,

Chris

[1] https://www.freebsd.org/doc/handbook/makeworld.html