Help, I killed my machine.

[Björn König]

Ben Timby wrote:

> [...] I built the world and kernel as follows:

So I guess you didn't followed the step-by-step instructions in the 
migration guide?

http://www.freebsd.org/releases/5.4R/migration-guide.html

> cd /usr/src
> make buildworld && make buildkernel
> 
> [...]
>
> I did mergemaster -p.

The -p stands for "pre-buildworld mode", i.e. you should run it before 
buildworld. ;-)

I would do a fresh clean installation in your case now.

Björn