Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Mar 2015 14:41:26 +0000
From:      Tom Evans <tevans.uk@googlemail.com>
Cc:        FreeBSD Stable <freebsd-stable@freebsd.org>, Peter Olsson <list-freebsd-stable@jyborn.se>
Subject:   Re: There has to be a better way of merging /etc during a major freebsd-update
Message-ID:  <CAFHbX1%2BGDtTHvCRsFC-GdmfyeKh-Mb22CvQ1ck7ATXjOc7yobA@mail.gmail.com>
In-Reply-To: <2885765b7842d951d89a9712bd5ba86e@ultimatedns.net>
References:  <20150310120540.GN8223@pol-server.leissner.se> <2885765b7842d951d89a9712bd5ba86e@ultimatedns.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Mar 10, 2015 at 1:58 PM, Chris H <bsd-lists@bsdforge.com> wrote:
> Hello, Peter.
> This has probably been answered by now. But just in case.
> I believe what you're looking for is:
> mergemaster -vF
>
> This is my [chosen] default. I also find it helpful,
> as a "safety net" to
> cp _Rp /etc /eetc
>
> prior to the mergemaster(8) step.

I use these steps after new kernel boots OK with old world:

  zfs set readonly=off zroot
  zfs mount -a
  adjkerntz -i
  mergemaster -piF

  cd /usr/src
  make installworld
  mergemaster -iFPU
  make delete-old

I get very few questions asked of me by mergemaster.

Cheers

Tom



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFHbX1%2BGDtTHvCRsFC-GdmfyeKh-Mb22CvQ1ck7ATXjOc7yobA>