Date: Fri, 28 Oct 2011 20:15:37 -0700 From: Garrett Cooper <yanegomi@gmail.com> To: Kevin Oberman <kob6558@gmail.com> Cc: Thomas Mueller <mueller6727@bellsouth.net>, Doug Barton <dougb@freebsd.org>, freebsd-current@freebsd.org Subject: Re: Upgrade from source to RC1: problems with /etc : lost users and dbus Message-ID: <CAGH67wQ47ZmsH8e0WjvLO7peM1c0zhdJzL51wfm2qNf3%2BQgSmg@mail.gmail.com> In-Reply-To: <CAN6yY1uvd5vKRbruZWmRKk617MhWoYqk-E3c=EsHxDKKuLw=iA@mail.gmail.com> References: <CAFHbX1%2BWPM0E%2BUGpKKVb8WoNyeYBOp5GdrF59E3sgRp1TM8VRg@mail.gmail.com> <20111027102208.88BFB106564A@hub.freebsd.org> <20111028084329.134A0106566C@hub.freebsd.org> <4EAB5823.5090804@FreeBSD.org> <CAN6yY1uvd5vKRbruZWmRKk617MhWoYqk-E3c=EsHxDKKuLw=iA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Oct 28, 2011 at 8:09 PM, Kevin Oberman <kob6558@gmail.com> wrote:
> On Fri, Oct 28, 2011 at 6:34 PM, Doug Barton <dougb@freebsd.org> wrote:
>> On 10/28/2011 01:43, Thomas Mueller wrote:
>>> How does one run mergemaster without running roughshod over existing co=
nfiguration?
>>
>> Carefully? :) =A0Seriously ... always use the -P option, and/or add
>> PRESERVE_FILES in your mergemaster rc file. Watch the changes carefully.
>> If you have to, do the updates in more than one pass using the -r option
>> for subsequent runs. Do the simple ones first, then go back and do the
>> ones that you have to think harder about. I recommend against using the
>> -U option.
>>
>> It's not rocket science, it's just like any other system administration
>> task, it requires careful attention.
>
> I agree that just running mergemaster CAREFULLY does the job. The only
> time I was ever burned was when I was in a BIG hurry and ended up
> wasting a LOT of time. (I think I also learned.) Of course, I also
> remember merging /etc before we had mergemaster.
>
> I am a bit curious why you recommend against -U, though. I've been
> using it since it was added and have never had a problems. It's saved
> me quite a bit of time. Is thee a corner case that I'm missing?
Here's a prime example (follow the white rabbit on this commit
thread): http://lists.freebsd.org/pipermail/freebsd-current/2011-August/026=
310.html
.
Cheers,
-Garrett
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGH67wQ47ZmsH8e0WjvLO7peM1c0zhdJzL51wfm2qNf3%2BQgSmg>