From owner-freebsd-current@FreeBSD.ORG  Thu Oct 27 11:31:43 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55091106566B
	for <freebsd-current@freebsd.org>; Thu, 27 Oct 2011 11:31:43 +0000 (UTC)
	(envelope-from yanegomi@gmail.com)
Received: from mail-pz0-f44.google.com (mail-pz0-f44.google.com
	[209.85.210.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 293D08FC15
	for <freebsd-current@freebsd.org>; Thu, 27 Oct 2011 11:31:42 +0000 (UTC)
Received: by pzk4 with SMTP id 4so14226981pzk.3
	for <freebsd-current@freebsd.org>; Thu, 27 Oct 2011 04:31:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=subject:mime-version:content-type:from:in-reply-to:date:cc
	:content-transfer-encoding:message-id:references:to:x-mailer;
	bh=wCAawR04NnTvdbVJE+9OkJPElEVACsWSaRq19QzBERg=;
	b=fZJvR6kdG8IV3LTkywdGgxR0phQoq8IMkA3MhUtrlR/VKGyUaAvXBHd3xOU4dtHAfJ
	o2r0gqYOl5F7PZH6ndurUR6UW6xWOwJK3Ojmx1NFyDQ1hnCoZ2wlnBSkSo7OUqC+x5TV
	Qn/B6Wgjq5P91hIrGbe+WzWEAE7vZYM9ccb+w=
Received: by 10.68.74.4 with SMTP id p4mr73261769pbv.47.1319714649635;
	Thu, 27 Oct 2011 04:24:09 -0700 (PDT)
Received: from [192.168.20.5] (c-24-6-49-154.hsd1.ca.comcast.net.
	[24.6.49.154])
	by mx.google.com with ESMTPS id i10sm5908296pbn.10.2011.10.27.04.24.08
	(version=TLSv1/SSLv3 cipher=OTHER);
	Thu, 27 Oct 2011 04:24:08 -0700 (PDT)
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
From: Garrett Cooper <yanegomi@gmail.com>
In-Reply-To: <20111027111451.GO63910@hoeg.nl>
Date: Thu, 27 Oct 2011 04:24:06 -0700
Content-Transfer-Encoding: quoted-printable
Message-Id: <B0DE043A-58D6-445B-B838-A8090FD948A9@gmail.com>
References: <20111027102208.88BFB106564A@hub.freebsd.org>
	<CAFHbX1+WPM0E+UGpKKVb8WoNyeYBOp5GdrF59E3sgRp1TM8VRg@mail.gmail.com>
	<20111027111451.GO63910@hoeg.nl>
To: Ed Schouten <ed@80386.nl>
X-Mailer: Apple Mail (2.1084)
Cc: Tom Evans <tevans.uk@googlemail.com>,
	Thomas Mueller <mueller6727@bellsouth.net>, freebsd-current@freebsd.org
Subject: Re: Upgrade from source to RC1: problems with /etc : lost users and
	dbus
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 11:31:43 -0000

On Oct 27, 2011, at 4:14 AM, Ed Schouten wrote:

> * Tom Evans <tevans.uk@googlemail.com>, 20111027 13:06:
>> I have had this happen before, the PEBKAC. When running mergemaster,
>> it will prompt you to install new passwd, master.passwd and group
>> files - if you have added local users you must not say yes to this,
>> you must either merge the changes in or keep your local one.
>=20
> It would have been so awesome if our /etc/master.passwd and /etc/group
> included an #include directive.

Or a tool like etcupdate, which provides 3-way diff functionality, was =
available in base..
-Garrett=