Booting from GELI breaks after upgrade

[Steve Bertrand]

Please forgive the long post. I'll be as brief and informative as I
possibly can.

Background:

- 6.2 booting from USB stick (da0) with appropriate key entries in
(thumb drive) /boot/loader.conf to load ad0 with the key. GEOM_ELI and
crypto are compiled into kernel

- / is mounted as /dev/ad0.elia and the system takes over from there
(also mounting ad0.elib, d, e and f)

- this worked perfectly

Upgrade:

- cvsup to 7.0 yesterday afternoon

- buildworld, buildkernel and installkernel all went smoothly (crypto
and GEOM_ELI build into the new kernel)

- copied over the new kernel directory to /boot on the thumbdrive

Problem:

- box still boots from thumb drive, with the 7.0 kernel no problem

- when trying to mount root from /dev/ad0.elia, get a mountroot prompt

- ? shows only the ad0 and ad0x entries as possible mount points

- the ad0.elix partitions do not show up as options now

I can not identify why the .eli parts of the disk are not showing up. I
can't even tell if the system is actually attaching the GELI disk.

How can I tell if GEOM is doing the right thing here? Are the ad0x
entries seen when I am in mountroot> the actually encrypted, attached
partitions? Since the entire disk is encrypted, I wouldn't think those
types of entries would be seen by the unencrypted boot thumb disk.

I can boot from another unencrypted hard disk and mount the .elix
partitions under it manually so if there is any more information I can
provide to get any assistance, I will.

It took me near two weeks to get this setup working how I wanted, and I
KNEW I shouldn't of upgraded this one first, but it's the only way to
learn the migration method of a GELI encrypted setup.

TIA if anyone can provide any insight.

Steve