Yes, indeed, the process Stefan is using is the correct process, IMHO, and should be formalized.
That is, after booting a given kernel (and it does need to be done immediately during/after booting so that a same-version upgrade doesn't replace it), that kernel and it's initrd should be "stashed" as the kernel to thaw into. Then the hibernation process should modify grub to add a "thaw from hibernate" option that boots the stashed kernel/initrd in addition to the other existing kernel options. The thaw option should probably be default though. In fact, writing up a package to plug all of that into the boot/hibernate/thaw process shouldn't be terribly difficult I think.
signature.asc
Description: OpenPGP digital signature