From owner-freebsd-current@FreeBSD.ORG  Fri Oct 28 15:25:53 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 C90781065674;
	Fri, 28 Oct 2011 15:25:53 +0000 (UTC) (envelope-from kama@pvp.se)
Received: from ms1.as.pvp.se (mail.pvp.se [213.64.187.227])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A0868FC12;
	Fri, 28 Oct 2011 15:25:53 +0000 (UTC)
Received: by ms1.as.pvp.se (Postfix, from userid 1001)
	id B5C3270; Fri, 28 Oct 2011 16:57:47 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by ms1.as.pvp.se (Postfix) with ESMTP
	id B12E46F; Fri, 28 Oct 2011 16:57:47 +0200 (CEST)
Date: Fri, 28 Oct 2011 16:57:47 +0200 (CEST)
From: kama <kama@pvp.se>
X-X-Sender: kama@ns1.as.pvp.se
To: John Baldwin <jhb@freebsd.org>
In-Reply-To: <201110280749.58837.jhb@freebsd.org>
Message-ID: <20111028165451.O37058@ns1.as.pvp.se>
References: <20111027102208.88BFB106564A@hub.freebsd.org>
	<CAFHbX1+WPM0E+UGpKKVb8WoNyeYBOp5GdrF59E3sgRp1TM8VRg@mail.gmail.com>
	<20111027111451.GO63910@hoeg.nl> <201110280749.58837.jhb@freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: Tom Evans <tevans.uk@googlemail.com>, Ed Schouten <ed@80386.nl>,
	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: Fri, 28 Oct 2011 15:25:53 -0000



On Fri, 28 Oct 2011, John Baldwin wrote:

> On Thursday, October 27, 2011 7:14:51 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.
> >
> > It would have been so awesome if our /etc/master.passwd and /etc/group
> > included an #include directive.
>
> I do agree with this.  Or if you could have /etc/passwd.d and /etc/group.d
> directories that can contain files that are auto-included.

Another idea is to let mergemaster call pw(8) to add remove users and
groups instead of merging the files.

It does not cover /etc/aliases though... But that is minor to this. =)

/Bjorn