GELI partition mount on boot fails after 7.0 -> 7.1-PRERELEASE upgrade

[Kyryll A Mirnenko aka Mirya]

I was using a GELI partition for /usr/home on 7.0, so it attaches and mounts 
on boot. The problem is it stopped working after the system was upgraded to 
RELENG_7/7.1-PRERELEASE. Here's how it goes:

I have the following /etc/fstab:

/dev/ad0s1b             none            swap    sw              0       0
/dev/ad0s1a             /               ufs     rw              1       1
/dev/ad0s1d             /tmp            ufs     rw              2       2
/dev/ad0s1e             /var            ufs     rw              2       2
/dev/ad0s1f.eli         /usr/home       ufs     rw              2       2

After upgrading to 7.1 and rebooting:

...
Configuring Disk Encryption for ad0s1f.
Enter passphrase:

geli:
Cannot access ad0s1f (error=1).

Attach failed; attempt 1 of 3.
Enter passphrase:

geli:
Wrong key for ad0s1f.

Attach failed; attempt 2 of 3.
Enter passphrase:

geli:
Wrong key for ad0s1f.
...

(the key entered is actually valid and attaching succeeds on 7.0 at this 
point). As far as mounting failed i'm entering the single-user mode, 
where "geli attach /dev/ad0s1f" works perfectly:

GEOM_ELI: Device ad0s1f.eli created.
GEOM_ELI: Encryption: AES-CBC 128
GEOM_ELI:     Crypto: software

After that exiting back to multi-user mounts the missing /usr/home, so loading 
completes.
-- 
Regards, Mirya
ICQ #313898202