From owner-freebsd-stable@FreeBSD.ORG Wed May 10 00:43:58 2006 Return-Path: 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 C3A1816A403 for ; Wed, 10 May 2006 00:43:58 +0000 (UTC) (envelope-from cscotts@mindspring.com) Received: from relay02.pair.com (relay02.pair.com [209.68.5.16]) by mx1.FreeBSD.org (Postfix) with SMTP id 3D0CD43D45 for ; Wed, 10 May 2006 00:43:57 +0000 (GMT) (envelope-from cscotts@mindspring.com) Received: (qmail 23637 invoked from network); 10 May 2006 00:43:56 -0000 Received: from unknown (HELO ?192.168.1.100?) (unknown) by unknown with SMTP; 10 May 2006 00:43:56 -0000 X-pair-Authenticated: 68.79.13.249 Mime-Version: 1.0 (Apple Message framework v749.3) In-Reply-To: <200605100203.18911.pieter@degoeje.nl> References: <445C03E4.80900@paradise.net.nz> <20060506135412.Q91930@carver.gumbysoft.com> <44611CFB.6030804@paradise.net.nz> <200605100203.18911.pieter@degoeje.nl> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <906D3CB1-AAB5-4162-87D6-3F5C118AE6AF@mindspring.com> Content-Transfer-Encoding: 7bit From: Scott Sipe Date: Tue, 9 May 2006 19:43:55 -0500 To: freebsd-stable@freebsd.org X-Mailer: Apple Mail (2.749.3) 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 May 2006 00:43:58 -0000 On May 9, 2006, at 7:03 PM, Pieter de Goeje wrote: > Hi Mark, > > On Wednesday 10 May 2006 00:51, Mark Kirkwood wrote: >> Doug White wrote: >>> On Sat, 6 May 2006, Mark Kirkwood wrote: >>>> I found that installworld stops, because the 'audit' group has >>>> not been >>>> created. Now I just pressed 'return' for the default actions during >>>> mergemaster -p, but I didn't notice any mention of the audit group. >>> >>> The default action is to do nothing, so its possible you just >>> missed it >>> as you were blazing through. :-) >> >> 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. I can vouch for this working properly! I just ran mergemaster -p in the process of upgrading, when it gets to the passwd and group file, I press M for merge, and select from l and r (left and right) which side I want to keep. Thus I get the new FreeBSD ID string, the new audit group, and all my old local mods. Scott