Date: Sat, 22 Feb 2003 14:48:11 -0800 (PST) From: Brian O'Shea <b_oshea@yahoo.com> To: Peter Wu <peterwu@canada.com>, Kevin Oberman <oberman@es.net> Cc: Brian O'Shea <b_oshea@yahoo.com>, freebsd-stable@FreeBSD.ORG Subject: Re: STABLE buildworld/buildkernel on 4.5-R apparently worked Message-ID: <20030222224811.28252.qmail@web10501.mail.yahoo.com> In-Reply-To: <86d6lk8yrd.fsf@vanilla.z>
next in thread | previous in thread | raw e-mail | index | archive | help
--- Peter Wu <peterwu@canada.com> wrote: > "Kevin Oberman" <oberman@es.net> writes: > [...] > > Yes. Be very sure that you run 'mergemaster -p' before you attempt to > > install the new system. If you don't, installworld might fail in a > > very ugly way. > > 4.5-RELEASE does not have a mergemaster that knows -p switch. I used src/usr.sbin/mergemaster/mergemaster.sh from the cvsup'ed directory instead and it worked. In -STABLE, the -p option tells mergemaster to only compare "crucial files". The only differences that it reported were in /etc/master.passwd, /etc/group, and /etc/make.conf (make.conf didn't exist on my 4.5-RELEASE system; there was only an /etc/defaults/make.conf). FWIW, the upgrade went cleanly and my system works (except for a panic, which I reported on this list earlier today but apparently hasn't been posted yet [???]). Thanks to all who replied, -brian __________________________________________________ Do you Yahoo!? Yahoo! Tax Center - forms, calculators, tips, more http://taxes.yahoo.com/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030222224811.28252.qmail>