About mergemaster (Re: upgrading)
aga at rsm.ru
Mon Sep 22 11:00:04 PDT 2003
I had a lot of different words to say into the air while upgrading :)
I had only 5 FreeBSD boxes, so I can imagine others with 50, 100 or more :(
Most painful procedure for me is running mergemaster. Most of the job of
it can be
done _automatically_, but it does not. Though indeed it already do much.
I cannot see any reason to report me all the differences developers
bring into the
distribution. I can use cvs to do that if I wish, am I right? I see the
problem in the
inability of the mergemaster to detect changed (comparing to the
file and to mark the file "clean".
I'm changing 2-3 system configs, so one can see changed file simply
hash of the original file, say, in the "$MD5: " custom header (not
including that line itself
while calculating hash, or it will be a big trick to produce such file).
How the idea?
Nick Barnes wrote:
>At 2003-09-21 10:19:31+0000, "Jacob" writes:
>>A few different people have told me different ways here, don't wanna risk
>>screwing it up.
>>I cvsupped with stable-supfile and ports-supfile, now I'm doing make
>>buildworld. Now, the way I was going to do it was after the
>>buildworld, make buildkernel KERNCONF=MILOWARE, then make
>>installkernel=MILOWARE, then a restart. After that doing make
>>installworld then mergemaster.
>>Is this right?
>The right thing to do is *always* this:
>0. Subscribe to -stable. Do not upgrade if there's a firestorm on
> being reported on -stable.
>2. Read /usr/src/UPDATING.
>3. Follow the instructions there.
>Note that this cannot be automated.
More information about the freebsd-stable