aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-10-13 23:31:31 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-10-13 23:31:31 +0000
commit360ce3baf9df88c95b55fdb4d2c3b71a23449667 (patch)
treec344e7a31b67dd164ec5e4f48176d519dc8eb06f
parentBug #286187: Complete multipath support. (diff)
downloadgenkernel-360ce3baf9df88c95b55fdb4d2c3b71a23449667.tar.gz
genkernel-360ce3baf9df88c95b55fdb4d2c3b71a23449667.tar.bz2
genkernel-360ce3baf9df88c95b55fdb4d2c3b71a23449667.zip
Document resume parameters.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--ChangeLog3
-rw-r--r--doc/genkernel.8.txt4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb5e9160..3a795e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
# Distributed under the GPL v2
# $Id$
+ 13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt:
+ Document resume parameters.
+
13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> arch/alpha/modules_load,
arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load,
arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load,
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 03778281..0f88334a 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -550,7 +550,9 @@ which the ramdisk scripts would recognize.
*real_resume*=<...>::
*resume*=<...>::
*noresume*::
- TO BE DOCUMENTED
+ *noresume* disables any default resume parameters. *resume* and
+ *real_resume* specify a device via LABEL or UUID to use for for loading a
+ TuxOnICE, SWSUSP or Suspend2 resume image.
*cdroot*[=<...>]::
*cdroot_type*=<...>::