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

[Jan Kundrat]

jkt         08/01/21 12:12:12

  Modified:             power-management-guide.xml
  Log:
  TuxOnIce is new name of former suspend2 (reported by calchan)

Revision  Changes    Path
1.33                 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.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/power-management-guide.xml?r1=1.32&r2=1.33

Index: power-management-guide.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- power-management-guide.xml	3 Dec 2007 19:31:10 -0000	1.32
+++ power-management-guide.xml	21 Jan 2008 12:12:12 -0000	1.33
@@ -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.32 2007/12/03 19:31:10 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/power-management-guide.xml,v 1.33 2008/01/21 12:12:12 jkt Exp $ -->
 <guide link="/doc/en/power-management-guide.xml">
 <title>Power Management Guide</title>
 
@@ -23,8 +23,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.37</version>
-<date>2007-12-03</date>
+<version>1.38</version>
+<date>2008-01-21</date>
 
 <chapter>
 <title>Introduction</title>
@@ -154,8 +154,8 @@
 
 <p>
 There are different kernel sources in Portage. I'd recommend using
-<c>gentoo-sources</c> or <c>suspend2-sources</c>. The latter contains patches
-for Software Suspend 2, see the chapter about <uri link="#doc_chap7">sleep
+<c>gentoo-sources</c> or <c>tuxonice-sources</c>. The latter contains patches
+for TuxOnIce, see the chapter about <uri link="#doc_chap7">sleep
 states</uri> for more details. When configuring the kernel, activate at least
 these options:
 </p>
@@ -1332,22 +1332,22 @@
 
 <p>
 There are two different implementations for S4. The original one is swsusp,
-then there is the newer suspend2 with a nicer interface (including fbsplash
-support). A <uri link="http://suspend2.net/features.html#compare"> feature
-comparison</uri> is available at the <uri link="http://suspend2.net"> suspend2
+then there is the newer tuxonice (former suspend2) with a nicer interface (including fbsplash
+support). A <uri link="http://tuxonice.net/features.html#compare"> feature
+comparison</uri> is available at the <uri link="http://www.tuxonice.net">tuxonice
 Homepage</uri>. There used to be Suspend-to-Disk (pmdisk), a fork of swsusp,
 but it has been merged back.
 </p>
 
 <p>
-Suspend2 is not included in the mainline kernel yet, therefore you either have
+TuxOnIce is not included in the mainline kernel yet, therefore you either have
 to patch your kernel sources with the patches provided by <uri
-link="http://suspend2.net">suspend2.net</uri> or use
-<c>sys-kernel/suspend2-sources</c>.
+link="http://tuxonice.net">tuxonice.net</uri> or use
+<c>sys-kernel/tuxonice-sources</c>.
 </p>
 
 <p>
-The kernel part for both swusp and suspend2 is as follows:
+The kernel part for both swusp and TuxOnIce is as follows:
 </p>
 
 <pre caption="Kernel configuration for the various suspend types">
@@ -1357,8 +1357,8 @@
       <comment>(replace /dev/SWAP with your swap partition)</comment>
       (/dev/SWAP)      Default resume partition
 
-  <comment>(hibernate with suspend2)</comment>
-  Software Suspend 2
+  <comment>(hibernate with TuxOnIce)</comment>
+  Enhanced Hibernation (TuxOnIce)
     --- Image Storage (you need at least one writer)
     [*]     File Writer
     [*]    Swap Writer
@@ -1406,7 +1406,7 @@
 </pre>
 
 <p>
-The following section discusses the setup of suspend2 including fbsplash
+The following section discusses the setup of TuxOnIce including fbsplash
 support for a nice graphical progress bar during suspend and resume.
 </p>
 
@@ -1414,23 +1414,23 @@
 The first part of the configuration is similar to the configuration of swsusp.
 In case you didn't store the location of your swap partition in the kernel
 config, you have to pass it as a kernel parameter with the
-<c>resume2=swap:/dev/SWAP</c> directive. If booting is not possible due to a
-broken image, append the <c>noresume2</c> parameter. Additionally, the
-<c>hibernate-cleanup</c> init script invalidates suspend2 images during the
+<c>resume=swap:/dev/SWAP</c> directive. If booting is not possible due to a
+broken image, append the <c>noresume</c> parameter. Additionally, the
+<c>hibernate-cleanup</c> init script invalidates TuxOnIce images during the
 boot process.
 </p>
 
-<pre caption="Invalidating suspend2 images during the boot process">
+<pre caption="Invalidating TuxOnIce images during the boot process">
 # <i>rc-update add hibernate-cleanup boot</i>
 </pre>
 
 <p>
-Now edit <path>/etc/hibernate/suspend2.conf</path>, enable the <c>suspend2</c>
+Now edit <path>/etc/hibernate/suspend2.conf</path>, enable the <c>TuxOnIce</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">
+<pre caption="Hibernating with TuxOnIce">
 # <i>nano -w /etc/hibernate/suspend2.conf</i>
 <comment>(Make sure you have a backup of your data)</comment>
 # <i>hibernate</i>
@@ -1438,16 +1438,16 @@
 
 <p>
 Please configure <c>fbsplash</c> now if you didn't do already. To enable
-fbsplash support during hibernation, the <c>sys-apps/suspend2-userui</c>
+fbsplash support during hibernation, the <c>sys-apps/tuxonice-userui</c>
 package is needed. Additionally, you've got to enable the <c>fbsplash</c> USE
 flag.
 </p>
 
-<pre caption="Installing suspend2-userui">
-# <i>echo "sys-apps/suspend2-userui fbsplash" >> /etc/portage/package.use</i>
+<pre caption="Installing tuxonice-userui">
+# <i>echo "sys-apps/tuxonice-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>
+# <i>echo "sys-apps/tuxonice-userui" >> /etc/portage/package.keywords</i>
+# <i>emerge tuxonice-userui</i>
 </pre>
 
 <p>
@@ -1461,31 +1461,31 @@
 
 <p>
 If you don't want a black screen in the first part of the resume process, you
-have to add the <c>suspend2ui_fbsplash</c> tool to your initrd image. Assuming
+have to add the <c>tuxoniceui_fbsplash</c> tool to your initrd image. Assuming
 you created the initrd image with <c>splash_geninitramfs</c> and saved it as
 <path>/boot/fbsplash-emergence-1024x768</path>, here's how to do that.
 </p>
 
-<pre caption="Adding suspend2ui_fbsplash to an initrd image">
+<pre caption="Adding tuxoniceui_fbsplash to an initrd image">
 # <i>mount /boot</i>
 # <i>mkdir ~/initrd.d</i>
 # <i>cp /boot/fbsplash-emergence-1024x768 ~/initrd.d/</i>
 # <i>cd ~/initrd.d</i>
 # <i>gunzip -c fbsplash-emergence-1024x768 | cpio -idm --quiet -H newc</i>
 # <i>rm fbsplash-emergence-1024x768</i>
-# <i>cp /usr/sbin/suspend2ui_fbsplash sbin/</i>
-# <i>find . | cpio --quiet --dereference -o -H newc | gzip -9 > /boot/fbsplash-suspend2-emergence-1024x768</i>
+# <i>cp /usr/sbin/tuxoniceui_fbsplash sbin/</i>
+# <i>find . | cpio --quiet --dereference -o -H newc | gzip -9 > /boot/fbsplash-tuxonice-emergence-1024x768</i>
 </pre>
 
 <p>
 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
+your TuxOnIce kernel uses
+<path>/boot/fbsplash-tuxonice-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">
-# <i>suspend2ui_fbsplash -t</i>
+# <i>tuxoniceui_fbsplash -t</i>
 </pre>
 
 <p>
@@ -1627,7 +1627,7 @@
 </p>
 
 <p>
-<e>Q:</e> I want to use suspend2, but it tells me my swap partition is too
+<e>Q:</e> I want to use TuxOnIce, but it tells me my swap partition is too
 small. Resizing is not an option.
 </p>
 
@@ -1635,7 +1635,7 @@
 <e>A:</e> If there is enough free space on your system, you can use the
 filewriter instead of the swapwriter. The <c>hibernate-script</c> supports it
 as well. More information can be found in
-<path>/usr/src/linux/Documentation/power/suspend2.txt</path>.
+<path>/usr/src/linux/Documentation/power/tuxonice.txt</path>.
 </p>
 
 <p>



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