From owner-freebsd-stable@FreeBSD.ORG Sat May 6 09:48:38 2006 Return-Path: X-Original-To: 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 3BB5216A401 for ; Sat, 6 May 2006 09:48:38 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8296043D58 for ; Sat, 6 May 2006 09:48:37 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 044D946C4B; Sat, 6 May 2006 05:48:37 -0400 (EDT) Date: Sat, 6 May 2006 10:48:36 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Mark Kirkwood In-Reply-To: <445C03E4.80900@paradise.net.nz> Message-ID: <20060506104625.R17611@fledge.watson.org> References: <445C03E4.80900@paradise.net.nz> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 09:48:38 -0000 On Sat, 6 May 2006, Mark Kirkwood wrote: > Last night I updated on of my machines from 6.0-RELEASE to 6.1-RC. As far as > I understand, I followed the instructions correctly - in particular: > > boot -s > # fsck -p > # mount -u / > # mount -a > # adjkerntz -i > # cd /usr/src > # mergemaster -p > # make installworld > > 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. > > after manually adding it, and re-running installworld, I noticed that (after > delete-old) the second 'mergemaster' has a group temporary file with 'audit' > in it (as it wanted to remove mine and add its own - I'd used 70 instead of > 77 as gid). > > So...err, I obviously missed something in during mergemaster -p, where does > it do the audit addition? mergemaster -p should pick it up -- I can't help but wonder if maybe you did actually try to merge the change but perhaps made a mistake in merging previously? mergemaster detects changes in files by looking at their $FreeBSD$ ID string. Normally, mergemaster won't present a file for update if the strings are the same, regardless of other differences, as it will assume they are local changes. If it had previously tried to present the addition of the audit group, and you had missed it then, it would not notice it this time around. You might notice, however, in installworld, as a dependence on the group existing was added after the group was added. Robert N M Watson