diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-06-15 17:50:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-15 17:50:37 +0200 |
| commit | 4b381a9ef65d68dc79760b093436a9c81f43fa5d (patch) | |
| tree | 8f565ab4a36fa9213c41a9048e8aa5fb9e1e1f69 /man | |
| parent | bafa9641446852f7fa15ca12d08a223d345c78ea (diff) | |
| parent | 8b6805a25bd6e2434bc402bff52656ae13216d21 (diff) | |
| download | systemd-4b381a9ef65d68dc79760b093436a9c81f43fa5d.tar.gz | |
Merge pull request #12753 from jrouleau/fix/hibernate-resume-timeout
hibernate-resume: fix resume device timeout
Diffstat (limited to 'man')
| -rw-r--r-- | man/kernel-command-line.xml | 3 | ||||
| -rw-r--r-- | man/systemd-hibernate-resume-generator.xml | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 40b7766214..903ff924f5 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -402,10 +402,11 @@ <varlistentry> <term><varname>resume=</varname></term> + <term><varname>resumeflags=</varname></term> <listitem> <para>Enables resume from hibernation using the specified - device. All + device and mount options. All <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>-like paths are supported. For details, see <citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml index ff105d435c..f532a19a48 100644 --- a/man/systemd-hibernate-resume-generator.xml +++ b/man/systemd-hibernate-resume-generator.xml @@ -56,6 +56,13 @@ </varlistentry> <varlistentry> + <term><varname>resumeflags=</varname></term> + + <listitem><para>Takes the resume device mount options to + use. Defaults <varname>rootflags=</varname> if not specified.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>noresume</varname></term> <listitem><para>Do not try to resume from hibernation. If this parameter is |