Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Jun 2008 17:51:04 +0300
From:      Mike Makonnen <mtm@wubethiopia.com>
To:        Pawel Jakub Dawidek <pjd@FreeBSD.org>
Cc:        Dag-Erling Sm??rgrav <des@des.no>, Brooks Davis <brooks@FreeBSD.org>, freebsd-rc@FreeBSD.org, src-committers@FreeBSD.org
Subject:   Re: svn commit: r179669 - head/sbin/rcorder
Message-ID:  <484FE658.6070008@wubethiopia.com>
In-Reply-To: <20080611141048.GC2098@garage.freebsd.pl>
References:  <200806090907.m5997wwM043284@svn.freebsd.org> <86hcc2vjnv.fsf@ds4.des.no> <484E2E05.5080804@wubethiopia.com> <86lk1du3au.fsf@ds4.des.no> <20080610145350.GA19374@lor.one-eyed-alien.net> <484FB5DE.8060001@wubethiopia.com> <20080611121338.GA2098@garage.freebsd.pl> <484FCFE3.7030107@wubethiopia.com> <20080611141048.GC2098@garage.freebsd.pl>

next in thread | previous in thread | raw e-mail | index | archive | help
Pawel Jakub Dawidek wrote:
> On Wed, Jun 11, 2008 at 04:15:15PM +0300, Mike Makonnen wrote:
> [...]
>> Which is exactly why mergemaster(8) has a -U option (it's such a 
>> time-saver I don't understand why it's not enabled by default).
> [...]
>> Again:
>> why re-invent the wheel? The mergemaster(8) command already does this, 
>> except that the md5 sum doesn't live in the file, but in 
>> /var/db/mergemaster.mtree.
> 
> I thought it doesn't work for the first mergemaster(8) run. Am I wrong?
> 

No, you are correct.

I think I misunderstood you the first time. Are you suggesting to 
generate the md5 sum during buildworl/installworld time, and then have 
the bsd.*.mk glue auto-upgrade files based on this? Yes, I see how this 
would avoid mergemaster's problem of needing to prime its "cache". 
However, this stops working if the user modifies the file. I believe, in 
mergemaster's case if the user modifies the file you are asked to 
manually upgrade it the next time you run mergemaster, but after that it 
goes back to automatically updating it.

I suppose mergemaster(8) could be modified to  take advantage of this to 
prime it's cache before the first run, and then we could have the best 
of both worlds. This bears thinking on...

Never the less, I think enabling the -i and -U options by default in 
mergemaster(8) (see other email sent to dougb, -rc, and -current) would 
go a long way to addressing your concerns regarding the extra churn 
involved in updating rc.d files.

Cheers.
-- 
Mike Makonnen       | GPG-KEY: http://people.freebsd.org/~mtm/mtm.asc
mtm @ FreeBSD.Org   | AC7B 5672 2D11 F4D0 EBF8  5279 5359 2B82 7CD4 1F55
FreeBSD             | http://www.freebsd.org



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?484FE658.6070008>