diff options
author | Sebastian Capella <sebastian.capella@linaro.org> | 2013-08-26 17:54:49 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-08-27 04:44:52 -0400 |
commit | 1c93669929f0f52e7033c6529274dce8cc46a9a1 (patch) | |
tree | 635ff99106d55a086483908ebbb3dfea848e90fc | |
parent | 9ed354b732689c9dbff6820ce57196e7e499c1fc (diff) |
PM / Hibernate: add section for resume options
Expand the existing documentation to explicitly list the options for
resuming a hibernation image, including the manual resume option which
can be used from the initrd or initramfs and the kernel init resume.
Signed-off-by: Sebastian Capella <sebastian.capella@linaro.org>
Acked-by: Rob Landley <rob@landley.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | Documentation/power/swsusp.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index 0b4b63e7e9b6..079160e22bcc 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt | |||
@@ -50,6 +50,19 @@ echo N > /sys/power/image_size | |||
50 | 50 | ||
51 | before suspend (it is limited to 500 MB by default). | 51 | before suspend (it is limited to 500 MB by default). |
52 | 52 | ||
53 | . The resume process checks for the presence of the resume device, | ||
54 | if found, it then checks the contents for the hibernation image signature. | ||
55 | If both are found, it resumes the hibernation image. | ||
56 | |||
57 | . The resume process may be triggered in two ways: | ||
58 | 1) During lateinit: If resume=/dev/your_swap_partition is specified on | ||
59 | the kernel command line, lateinit runs the resume process. If the | ||
60 | resume device has not been probed yet, the resume process fails and | ||
61 | bootup continues. | ||
62 | 2) Manually from an initrd or initramfs: May be run from | ||
63 | the init script by using the /sys/power/resume file. It is vital | ||
64 | that this be done prior to remounting any filesystems (even as | ||
65 | read-only) otherwise data may be corrupted. | ||
53 | 66 | ||
54 | Article about goals and implementation of Software Suspend for Linux | 67 | Article about goals and implementation of Software Suspend for Linux |
55 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 68 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
@@ -326,7 +339,7 @@ Q: How can distributions ship a swsusp-supporting kernel with modular | |||
326 | disk drivers (especially SATA)? | 339 | disk drivers (especially SATA)? |
327 | 340 | ||
328 | A: Well, it can be done, load the drivers, then do echo into | 341 | A: Well, it can be done, load the drivers, then do echo into |
329 | /sys/power/disk/resume file from initrd. Be sure not to mount | 342 | /sys/power/resume file from initrd. Be sure not to mount |
330 | anything, not even read-only mount, or you are going to lose your | 343 | anything, not even read-only mount, or you are going to lose your |
331 | data. | 344 | data. |
332 | 345 | ||