freebsd encrypted hard disk?

I read the "encrypting disk partitions" section of the Handbook. What is the preferred method nowdays, geli or gbde? Is there another method that would be better? ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/fr

mergemaster goof when src upgrading 7.0 -> 7.1

I was doing a src upgrade from 7.0 to 7.1 After installkernel, i rebooted, and accidently ran "mergemaster" instead of "mergemaster -p" before installworld. I ctrl-c'd once I realized what I had done, but the damage was done. It seems to have overwritten my password and group files. I successful