Date: Wed, 23 Oct 2002 07:46:12 -0400 From: pippo@bellnet.ca To: Annelise Anderson <andrsn@andrsn.stanford.edu> Cc: freebsd-newbies@freebsd.org Subject: Re: upgrade to 4.7 Message-ID: <5.1.0.14.2.20021023074431.00aa17e8@pop51.bellnet.ca> In-Reply-To: <Pine.BSF.4.10.10210230311090.54120-100000@andrsn.stanford. edu> References: <5.1.0.14.2.20021022122918.00a901b0@mail.host45.com>
next in thread | previous in thread | raw e-mail | index | archive | help
At 03:34 AM 10/23/2002 -0700, you wrote: >It's puzzling to figure out what went wrong here--did you get >sources with cvsup? If so, do the various directories in /usr/src have >populated subdirectories? > >Mergemaster is the last step, after you're run make buildworld, built and >loaded a new kernel, run installworld. Portupgrade has to do with >third-party software, not the base system, and so it isn't really >relevant to this process. There are some indications you have actually >upgraded to 5.0, and not 4.7--that did you use for a tag in your supfile? > >Mergemaster uses sdiff (so man sdiff if you're going to use it). It seems >you chose the empty side of the comparisons on the merge. The problem was with mergemaster -p I was trying to use it, as suggested in the manual, before running make buildworld. It was not clear at all and some of the ooptions, like 'v' just did not function. So, I restored the backed-up master.passwd and group files, ran vipw and saved the file without modification. Everything back to normal. I then did the upgrade and ran mergemaster last without problem. I now have a 4.7 that seems to be runing fine. kde3 and samba are running fine, so is apache and, I suspect, the other proggies too. Thanks for the help. PJ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-newbies" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5.1.0.14.2.20021023074431.00aa17e8>