From owner-freebsd-current@freebsd.org  Fri May 13 17:47:33 2016
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@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 BF304B39585
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Fri, 13 May 2016 17:47:33 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id A50351BBA;
 Fri, 13 May 2016 17:47:33 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [IPv6:::1])
 by freefall.freebsd.org (Postfix) with ESMTP id 9C5A4118C;
 Fri, 13 May 2016 17:47:33 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [172.31.3.2])
 by mail.xzibition.com (Postfix) with ESMTP id 47FD11D9F5;
 Fri, 13 May 2016 17:47:33 +0000 (UTC)
X-Virus-Scanned: amavisd-new at mail.xzibition.com
Received: from mail.xzibition.com ([172.31.3.2])
 by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new,
 port 10026)
 with LMTP id surF043ksGTa; Fri, 13 May 2016 17:47:30 +0000 (UTC)
Subject: Re: WARNING: [r299313] make installworld overwrites master.passwd and
 group!
DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com C59461D9EE
To: Glen Barber <gjb@FreeBSD.org>, "O. Hartmann" <ohartman@zedat.fu-berlin.de>
References: <20160510071557.5705384d@freyja.zeit4.iv.bundesimmobilien.de>
 <20160510054746.GZ47527@FreeBSD.org>
Cc: freebsd-current <freebsd-current@freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Organization: FreeBSD
Message-ID: <10483308-3757-b9d7-9024-b9ed0bfb6420@FreeBSD.org>
Date: Fri, 13 May 2016 10:47:28 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0)
 Gecko/20100101 Thunderbird/45.0
MIME-Version: 1.0
In-Reply-To: <20160510054746.GZ47527@FreeBSD.org>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 17:47:33 -0000

On 5/9/16 10:47 PM, Glen Barber wrote:
> On Tue, May 10, 2016 at 07:15:57AM +0200, O. Hartmann wrote:
>> On a most recent buildworld with make installworld/installkernel I faced the
>> fact that all the entries in /etc/master.passwd and /etc/group were reset to
>> the initial/vanilla values. Luckily, I was able to fetch backups
>> from /var/backups.
>>
>> I do not know which essential config files additionally got altered or reset to
>> the initial values.
>>
>> This bug is present on all systems I maintain and I ran into this problem on
>> approx ten boxes this morning.
>>
>> What is up here?
>>
> 
> Confirmed.  This is my fault, misreading what I thought was a mismerge
> (r299292).
> 
> Reverting it now.  I apologize for the inconvenience this caused you,
> and appreciate the prompt report on the issue.  It is reverted in
> r299317.


I've made the same mistake before.

Here's a patch that should be right:
https://people.freebsd.org/~bdrewery/patches/Makefile.inc1-restage-reinstall.diff


-- 
Regards,
Bryan Drewery