[gentoo-doc-cvs] cvs commit: power-management-guide.xml

[Josh Saddler]

nightmorph    07/02/20 17:44:15

  Modified:             power-management-guide.xml
  Log:
  updated power management guide for the new hibernate-script configuration, bug 167098

Revision  Changes    Path
1.24                 xml/htdocs/doc/en/power-management-guide.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?r1=1.23&r2=1.24

Index: power-management-guide.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- power-management-guide.xml	17 Dec 2006 03:42:50 -0000	1.23
+++ power-management-guide.xml	20 Feb 2007 17:44:15 -0000	1.24
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v 1.23 2006/12/17 03:42:50 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v 1.24 2007/02/20 17:44:15 nightmorph Exp $ -->
 <guide link="/doc/en/power-management-guide.xml">
 <title>Power Management Guide</title>
 
@@ -20,8 +20,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.30</version>
-<date>2006-12-16</date>
+<version>1.31</version>
+<date>2007-02-20</date>
 
 <chapter>
 <title>Introduction</title>
@@ -1294,19 +1294,26 @@
 
 <p>
 Some configuration has to be done in <path>/etc/hibernate</path> The default
-package introduces two configuration files <path>hibernate.conf</path> and
-<path>ram.conf</path>.
+package introduces a few configuration files for each sleep state.  Options that
+are common to all suspend methods are placed in <path>common.conf</path>; make
+sure this file is properly set up for your system.
 </p>
 
 <p>
-To configure sleep, edit <path>ram.conf</path> in <path>/etc/hibernate</path>.
-<c>UseSysfsPowerState mem</c> is already setup correctly, but you have to go
-through the rest of the configuration file and set it up for your system. The
-comments and option names will guide you. If you use nfs or samba shares over
-the network, make sure to shutdown the appropriate init scripts to avoid
-timeouts.
+To configure sleep, edit <path>sysfs-ram.conf</path> in
+<path>/etc/hibernate</path>. <c>UseSysfsPowerState mem</c> is already setup
+correctly, but you need to make further changes to this particular sleep state
+(or any other sleep state) you should add them to
+<path>/etc/hibernate/hibernate.conf</path>. The comments and option names will
+guide you. If you use nfs or samba shares over the network, make sure to
+shutdown the appropriate init scripts to avoid timeouts.
 </p>
 
+<note>
+For more information on setting up sleep states, read <c>man
+hibernate.conf</c>.
+</note>
+
 <p>
 Ready? Now is the last chance to backup any data you want to keep after
 executing the next command. Notice that you probably have to hit a special key
@@ -1319,10 +1326,9 @@
 
 <p>
 If you're still reading, it seems to work. You can also setup standby (S1) in a
-similar way by copying <path>ram.conf</path> to <path>standby.conf</path> and
-creating a symlink <path>/usr/sbin/hibernate-standby</path> pointing to
-<path>/usr/sbin/hibernate</path>. S3 and S4 are the more interesting sleep
-states due to greater energy savings however.
+similar way by editing <path>sysfs-ram.conf</path> and changing
+"UseSysfsPowerState mem" to "UseSysfsPowerState standby". S3 and S4 are the more
+interesting sleep states due to greater energy savings however.
 </p>
 
 </body>
@@ -1397,7 +1403,7 @@
 
 <p>
 To activate hibernate with swsusp, use the hibernate script and set
-<c>UseSysfsPowerState disk</c> in <path>/etc/hibernate/hibernate.conf</path>.
+<c>UseSysfsPowerState disk</c> in <path>/etc/hibernate/sysfs-disk</path>.
 </p>
 
 <warn>
@@ -1409,11 +1415,11 @@
 <p>
 If you experience kernel panics due to uhci or similar, try to compile USB
 support as module and unload the modules before sending your laptop to sleep
-mode. There are configuration options for this in <path>hibernate.conf</path>
+mode. There are configuration options for this in <path>common.conf</path>
 </p>
 
 <pre caption="Hibernating with swsusp">
-# <i>nano -w /etc/hibernate.conf</i>
+# <i>nano -w /etc/hibernate/common.conf</i>
 <comment>(Make sure you have a backup of your data)</comment>
 # <i>hibernate</i>
 </pre>
@@ -1438,14 +1444,13 @@
 </pre>
 
 <p>
-Now edit <path>/etc/hibernate/hibernate.conf</path>, enable the <c>suspend2</c>
-section and comment everything in the <c>sysfs_power_state</c> and
-<c>acpi_sleep</c> sections. Do not enable the <c>fbsplash</c> part in global
-options yet.
+Now edit <path>/etc/hibernate/suspend2.conf</path>, enable the <c>suspend2</c>
+options you need. Do not enable the <c>fbsplash</c> options in
+<c>common.conf</c> just yet.
 </p>
 
 <pre caption="Hibernating with suspend2">
-# <i>nano -w /etc/hibernate.conf</i>
+# <i>nano -w /etc/hibernate/suspend2.conf</i>
 <comment>(Make sure you have a backup of your data)</comment>
 # <i>hibernate</i>
 </pre>
@@ -1458,8 +1463,9 @@
 </p>
 
 <pre caption="Installing suspend2-userui">
-# <i>mkdir -p /etc/portage</i>
 # <i>echo "sys-apps/suspend2-userui fbsplash" >> /etc/portage/package.use</i>
+<comment>(It may be marked ~arch, so first it must be keyworded)</comment>
+# <i>echo "sys-apps/suspend2-userui" >> /etc/portage/package.keywords</i>
 # <i>emerge suspend2-userui</i>
 </pre>
 
@@ -1491,10 +1497,10 @@
 </pre>
 
 <p>
-Afterwards adjust <path>grub.conf</path> respectively <path>lilo.conf</path> so
-that your suspend2 kernel uses
-<path>/boot/fbsplash-suspend2-emergence-1024x768</path> as initrd image. You
-can now test a dry run to see if everything is setup correctly.
+Afterwards adjust <path>grub.conf</path> (or <path>lilo.conf</path>) so that
+your suspend2 kernel uses
+<path>/boot/fbsplash-suspend2-emergence-1024x768</path> as initrd image. You can
+now test a dry run to see if everything is setup correctly.
 </p>
 
 <pre caption="Test run for fbsplash hibernation">
@@ -1502,8 +1508,8 @@
 </pre>
 
 <p>
-Afterwards open <path>/etc/hibernate/hibernate.conf</path> again and activate
-the fbsplash options. Execute <c>hibernate</c> and enjoy.
+Afterwards open <path>/etc/hibernate/common.conf</path> and activate the
+fbsplash options. Execute <c>hibernate</c> and enjoy.
 </p>
 
 </body>



-- 
gentoo-doc-cvs@g.o mailing list