mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-27 04:03:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clarify the behaviour of suspend-then-sleep mode in the manual pages.

Browse Source 
Fixes #20125.
This commit is contained in:
Hamish Moffatt 2021-07-05 19:06:15 +10:00 committed by Zbigniew Jędrzejewski-Szmek
parent 8ca29d97f2
commit 33f899bd47
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
man/systemd-sleep.conf.xml
View File

@ -137,14 +137,17 @@
<filename>/sys/power/disk</filename> by, <filename>/sys/power/disk</filename> by,
respectively, respectively,
<citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or
<citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or <citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
<citerefentry><refentrytitle>systemd-suspend-then-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
More than one value can be specified by separating More than one value can be specified by separating
multiple values with whitespace. They will be tried multiple values with whitespace. They will be tried
in turn, until one is written without error. If in turn, until one is written without error. If
neither succeeds, the operation will be aborted. neither succeeds, the operation will be aborted.
</para>
<para><citerefentry><refentrytitle>systemd-suspend-then-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
uses the value of <varname>SuspendMode=</varname> when suspending and the value of <varname>HibernateMode=</varname> when hibernating.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -156,13 +159,15 @@
<filename>/sys/power/state</filename> by, <filename>/sys/power/state</filename> by,
respectively, respectively,
<citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-suspend.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or
<citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, or <citerefentry><refentrytitle>systemd-hybrid-sleep.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
<citerefentry><refentrytitle>systemd-suspend-then-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
More than one value can be specified by separating More than one value can be specified by separating
multiple values with whitespace. They will be tried multiple values with whitespace. They will be tried
in turn, until one is written without error. If in turn, until one is written without error. If
neither succeeds, the operation will be aborted. neither succeeds, the operation will be aborted.
</para>
<para><citerefentry><refentrytitle>systemd-suspend-then-hibernate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
uses the value of <varname>SuspendState=</varname> when suspending and the value of <varname>HibernateState=</varname> when hibernating.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

2
man/systemd-suspend.service.xml
View File

@ -103,8 +103,8 @@
<varlistentry> <varlistentry>
<term><option>suspend</option></term> <term><option>suspend</option></term>
<term><option>hibernate</option></term> <term><option>hibernate</option></term>
<term><option>hybrid-sleep</option></term>
<term><option>suspend-then-hibernate</option></term> <term><option>suspend-then-hibernate</option></term>
<term><option>hybrid-sleep</option></term>
<listitem><para>Suspend, hibernate, suspend then hibernate, or put the <listitem><para>Suspend, hibernate, suspend then hibernate, or put the
system to hybrid sleep.</para> system to hybrid sleep.</para>