Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Nov 2016 16:01:41 -0800
From:      Chris Stankevitz <chris@stankevitz.com>
To:        CyberLeo Kitsana <cyberleo@cyberleo.net>, FreeBSD Questions <freebsd-questions@freebsd.org>
Subject:   Re: Building world vs freebsd-update: merging files
Message-ID:  <4562874c-79b1-72fb-fb6b-1b1fb79e9a5c@stankevitz.com>
In-Reply-To: <6b6b7079-9cb1-da69-3099-2e418123f8ea@cyberleo.net>
References:  <6d78a3d4-e1bd-a640-d395-6d809b0069f9@stankevitz.com> <6b6b7079-9cb1-da69-3099-2e418123f8ea@cyberleo.net>

Next in thread | Previous in thread | Raw E-Mail | Index | Archive | Help
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



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?4562874c-79b1-72fb-fb6b-1b1fb79e9a5c>