From owner-freebsd-stable@FreeBSD.ORG  Tue Mar 10 14:41:27 2015
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 57381C79
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 14:41:27 +0000 (UTC)
Received: from mail-ig0-x22e.google.com (mail-ig0-x22e.google.com
 [IPv6:2607:f8b0:4001:c05::22e])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1CBCE792
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 14:41:27 +0000 (UTC)
Received: by igbhn18 with SMTP id hn18so3428039igb.2
 for <freebsd-stable@freebsd.org>; Tue, 10 Mar 2015 07:41:26 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=googlemail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:cc
 :content-type; bh=2cwxa7Og80g5fsrzcSk/ER45Y5cIoOyMWuu1VE38ltU=;
 b=jCud8s160L2iPCta+1tHEKF+LDYyLAo0kqgxTZWu+fTiK4ADFQUghR1QyvNbhAu1jh
 //Cu6esY1xyR1uDswnsFbKAgDHwMcBg+fFHo/2zczcE9NYUVdHCj5U3PKYiJXINnYTdM
 UZDMxVv3CG5SeYB2Py3Ljkq9Ll52zAJAb3egl+cZrFVvCjZVs/KQuTs6x7iY8oZhzUn9
 EROHlMtwJJck9VyrxJwair4ntFH3tvlZ2Kc/0gWzK0COj+f7WfsISlCJ/oavrITpg+Qn
 G7q0CvVS6CSbeKEozG26Q1lFQ7KuJo5ouFvyBsuz5tOcAqJc/7IMP6hnd4r/sEJa+ICn
 lDAg==
MIME-Version: 1.0
X-Received: by 10.42.199.193 with SMTP id et1mt28516650icb.75.1425998486399;
 Tue, 10 Mar 2015 07:41:26 -0700 (PDT)
Received: by 10.107.132.85 with HTTP; Tue, 10 Mar 2015 07:41:26 -0700 (PDT)
In-Reply-To: <2885765b7842d951d89a9712bd5ba86e@ultimatedns.net>
References: <20150310120540.GN8223@pol-server.leissner.se>
 <2885765b7842d951d89a9712bd5ba86e@ultimatedns.net>
Date: Tue, 10 Mar 2015 14:41:26 +0000
Message-ID: <CAFHbX1+GDtTHvCRsFC-GdmfyeKh-Mb22CvQ1ck7ATXjOc7yobA@mail.gmail.com>
Subject: Re: There has to be a better way of merging /etc during a major
 freebsd-update
From: Tom Evans <tevans.uk@googlemail.com>
Content-Type: text/plain; charset=UTF-8
Cc: FreeBSD Stable <freebsd-stable@freebsd.org>,
 Peter Olsson <list-freebsd-stable@jyborn.se>
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Mar 2015 14:41:27 -0000

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