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? Cheers Mark P.s : 6.1-RC is running very nicely right now. Great work!
Hi! On Sat, May 06, 2006 at 02:03:16PM +1200, Mark Kirkwood wrote:> 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?/usr/src/UPDATING. 20060204: The 'audit' group was added to support the new auditing functionality in the base system. Be sure to follow the directions for updating, including the requirement to run mergemaster -p. WBR -- Dmitriy Kirhlarov OILspace, 26 Leninskaya sloboda, bld. 2, 2nd floor, 115280 Moscow, Russia P:+7 495 105 7247 ext.203 F:+7 495 105 7246 E:DmitriyKirhlarov@oilspace.com OILspace - The resource enriched - www.oilspace.com
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
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. :-) Also, if you didn't delete the temporary directory last time, mergemaster will ask you if you want to re-use it. 9 times out of 10, the answer is 'no', but the default may be to save it. -- Doug White | FreeBSD: The Power to Serve dwhite@gumbysoft.com | www.FreeBSD.org