Comment 1 for bug 432785

Approach #1 might be less inconvenient than it first seems, since people that like to hibernate might not be doing normal boots and are therefore not inconvenienced by the extra password prompt during normal boot.

Here is a bzr patch for approach #1. It's really a new file, not a patch for the existing swap setup script. I think it's a good stop-gap measure until #2 or #3 are implemented. The patch does not affect existing flows and can be optionally run by people that care about hibernation.