From owner-freebsd-stable@FreeBSD.ORG  Wed May 10 02:57:22 2006
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
X-Original-To: freebsd-stable@freebsd.org
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9A98A16A401
	for <freebsd-stable@freebsd.org>; Wed, 10 May 2006 02:57:22 +0000 (UTC)
	(envelope-from markir@paradise.net.nz)
Received: from linda-5.paradise.net.nz (bm-5a.paradise.net.nz [203.96.152.184])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 295E643D4C
	for <freebsd-stable@freebsd.org>; Wed, 10 May 2006 02:57:22 +0000 (GMT)
	(envelope-from markir@paradise.net.nz)
Received: from smtp-2.paradise.net.nz
	(tclsnelb1-src-1.paradise.net.nz [203.96.152.172]) by
	linda-5.paradise.net.nz (Paradise.net.nz) with ESMTP id
	<0IZ1002SQ477G2@linda-5.paradise.net.nz> for
	freebsd-stable@freebsd.org; Wed, 10 May 2006 14:57:07 +1200 (NZST)
Received: from [192.168.1.11]
	(218-101-28-132.dsl.clear.net.nz [218.101.28.132])	by
	smtp-2.paradise.net.nz (Postfix) with ESMTP id D3384CA41D6;
	Wed, 10 May 2006 14:57:06 +1200 (NZST)
Date: Wed, 10 May 2006 14:57:02 +1200
From: Mark Kirkwood <markir@paradise.net.nz>
In-reply-to: <200605100203.18911.pieter@degoeje.nl>
To: Pieter de Goeje <pieter@degoeje.nl>
Message-id: <4461567E.6050602@paradise.net.nz>
MIME-version: 1.0
Content-type: text/plain; format=flowed; charset=ISO-8859-1
Content-transfer-encoding: 7bit
User-Agent: Thunderbird 1.5 (X11/20060417)
References: <445C03E4.80900@paradise.net.nz>
	<20060506135412.Q91930@carver.gumbysoft.com>
	<44611CFB.6030804@paradise.net.nz>
	<200605100203.18911.pieter@degoeje.nl>
Cc: freebsd-stable@freebsd.org
Subject: Re: 6.1-RC and the audit group
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: Wed, 10 May 2006 02:57:22 -0000

Pieter de Goeje wrote:
> Hi Mark,
> 
> On Wednesday 10 May 2006 00:51, Mark Kirkwood wrote:
>> Just updated another box to 6.1-STABLE, and yes I did 'return' though
>> it. The reason being mergemaster -p wanted to patch my group file to
>> remove all the additions (i.e, useful groups and group -> user
>> associations) as *well* as add the audit group.
> 
> Well unless -p changes mergemaster's behaviour, the general idea is that you 
> press 'm' for merge ( correct me if I'm wrong but I think mergemaster was 
> named after this feature :P ). It will let you add the new audit group _and_ 
> keep the extra groups.
> 
>

Thanks all - You are quite right - I'm clearly just being a bit thick...

Cheers

Mark