From owner-freebsd-stable@FreeBSD.ORG  Mon May  4 22:34:07 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B8A51065776
	for <freebsd-stable@freebsd.org>; Mon,  4 May 2009 22:34:07 +0000 (UTC)
	(envelope-from torfinn.ingolfsen@broadpark.no)
Received: from osl1smout1.broadpark.no (osl1smout1.broadpark.no [80.202.4.58])
	by mx1.freebsd.org (Postfix) with ESMTP id CCB2E8FC1F
	for <freebsd-stable@freebsd.org>; Mon,  4 May 2009 22:34:06 +0000 (UTC)
	(envelope-from torfinn.ingolfsen@broadpark.no)
MIME-version: 1.0
Content-transfer-encoding: 7BIT
Content-type: text/plain; charset=US-ASCII
Received: from osl1sminn1.broadpark.no ([80.202.4.59])
	by osl1smout1.broadpark.no
	(Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007;
	32bit)) with ESMTP id <0KJ500A9P5CTO860@osl1smout1.broadpark.no> for
	freebsd-stable@freebsd.org; Tue, 05 May 2009 00:34:05 +0200 (CEST)
Received: from kg-v2.kg4.no ([80.202.83.38]) by osl1sminn1.broadpark.no
	(Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007;
	32bit)) with SMTP id <0KJ5003EO5CTQ950@osl1sminn1.broadpark.no> for
	freebsd-stable@freebsd.org; Tue, 05 May 2009 00:34:05 +0200 (CEST)
Date: Tue, 05 May 2009 00:34:05 +0200
From: Torfinn Ingolfsen <torfinn.ingolfsen@broadpark.no>
To: freebsd-stable@freebsd.org
Message-id: <20090505003405.52398ad2.torfinn.ingolfsen@broadpark.no>
In-reply-to: <49FF5D9C.5060409@unsane.co.uk>
References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no>
	<49FF5D9C.5060409@unsane.co.uk>
X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.1; amd64-portbld-freebsd7.2)
X-Face: "t9w2,-X@O^I`jVW\sonI3.,36KBLZE*AL[y9lL[PyFD*r_S:dIL9c[8Y>V42R0"!"yb_zN,f#%.[PYYNq;
	m"_0v;
	~rUM2Yy!zmkh)3&U|u!=<N>T(zyv,MHJv"nDH>OJ`t(@mil461d_B'Uo|'nMwlKe0Mv=kvV?Nh@>Hb<3s_z2jYgZhPb@?Wi^x1a~Hplz1.zH
Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Mon, 04 May 2009 22:34:07 -0000

On Mon, 04 May 2009 22:26:52 +0100
Vincent Hoffman <vince@unsane.co.uk> wrote:

> Not that its a cure but are master.passwd and group backups in
> /var/backups any help to you in this case?

Ah - great tip - thanks!
(In case of the first server, the changes to group and passwd files were
few, so I just re-did the changes from memory. The only part I had to
look up was user and group mysql. So restoring from /var/backups would
have been quicker.)
-- 
Regards, 
Torfinn Ingolfsen