upgrade 5.4 -> 6.1

[Perttu Laine]

I'm running production servers with 5.4 now and wondering if this is all I
need to do when upgrading to 6.1:

1. change RELENG_5_4 to 6_1 and cvsup sources.
2. make buildworld
3. make buildkernel KERNCONF=<filename>
4. make installkernel KERNCONF=<filename>
5. reboot to single user
6. mergemaster -p
7. make installworld
8. mergemaster
9. reboot

Or is there something more to take care of in this upgrade?

And not even sure yet if I'm going to upgrade to 6.1 or going with 5.5, but
still asking before trying... :)

-- 
kpn @ IRCnet