[BUGS] ZFS dis-integration

[Andrew Sinclair]

On 12 July 2010 08:33, John Marshall <john.marshall at riverwillow.com.au> wrote:
> On Sun, 11 Jul 2010, 03:42 +1000, Andrew Sinclair wrote:
>>
>> 1) The first time I run mergemaster, I can expect changes I missed in
>> the mailing lists. The system I am upgrading is generally performing a
>> service, so I cannot keep it down for too long.
>>   I have kept records of my old ETC in the past. Now I am aware this
>> is my fault, but those records were disjointed and there were many
>> differences to keep track of. Most of these differences were vendor
>> supplied, and some reflected states that were no longer relevant to my
>> environment.
>
> I always include -P in my mergemaster runs - just in case there are any
> surprises; then I can diff what was there before with what landed there
> just now and restore sanity.
>
>     -P          Preserve files that you replace in
>                 /var/tmp/mergemaster/preserved-files-<date>, or another
>                 directory you specify in your mergemaster rc file.
>
I'll try this when 8.1 is out. Thanks for pointing this out, I missed it.