Merge pull request #12753 from jrouleau/fix/hibernate-resume-timeout
hibernate-resume: fix resume device timeout
This commit is contained in:
commit
4b381a9ef6
|
@ -402,10 +402,11 @@
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>resume=</varname></term>
|
<term><varname>resume=</varname></term>
|
||||||
|
<term><varname>resumeflags=</varname></term>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Enables resume from hibernation using the specified
|
<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
|
<citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>-like
|
||||||
paths are supported. For details, see
|
paths are supported. For details, see
|
||||||
<citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
<citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
||||||
|
|
|
@ -55,6 +55,13 @@
|
||||||
supported.</para></listitem>
|
supported.</para></listitem>
|
||||||
</varlistentry>
|
</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>
|
<varlistentry>
|
||||||
<term><varname>noresume</varname></term>
|
<term><varname>noresume</varname></term>
|
||||||
|
|
||||||
|
|
|
@ -17,9 +17,13 @@
|
||||||
|
|
||||||
static const char *arg_dest = "/tmp";
|
static const char *arg_dest = "/tmp";
|
||||||
static char *arg_resume_device = NULL;
|
static char *arg_resume_device = NULL;
|
||||||
|
static char *arg_resume_options = NULL;
|
||||||
|
static char *arg_root_options = NULL;
|
||||||
static bool arg_noresume = false;
|
static bool arg_noresume = false;
|
||||||
|
|
||||||
STATIC_DESTRUCTOR_REGISTER(arg_resume_device, freep);
|
STATIC_DESTRUCTOR_REGISTER(arg_resume_device, freep);
|
||||||
|
STATIC_DESTRUCTOR_REGISTER(arg_resume_options, freep);
|
||||||
|
STATIC_DESTRUCTOR_REGISTER(arg_root_options, freep);
|
||||||
|
|
||||||
static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
|
static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
|
||||||
|
|
||||||
|
@ -35,6 +39,22 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
|
||||||
|
|
||||||
free_and_replace(arg_resume_device, s);
|
free_and_replace(arg_resume_device, s);
|
||||||
|
|
||||||
|
} else if (streq(key, "resumeflags")) {
|
||||||
|
|
||||||
|
if (proc_cmdline_value_missing(key, value))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (!strextend_with_separator(&arg_resume_options, ",", value, NULL))
|
||||||
|
return log_oom();
|
||||||
|
|
||||||
|
} else if (streq(key, "rootflags")) {
|
||||||
|
|
||||||
|
if (proc_cmdline_value_missing(key, value))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (!strextend_with_separator(&arg_root_options, ",", value, NULL))
|
||||||
|
return log_oom();
|
||||||
|
|
||||||
} else if (streq(key, "noresume")) {
|
} else if (streq(key, "noresume")) {
|
||||||
if (value) {
|
if (value) {
|
||||||
log_warning("\"noresume\" kernel command line switch specified with an argument, ignoring.");
|
log_warning("\"noresume\" kernel command line switch specified with an argument, ignoring.");
|
||||||
|
@ -49,6 +69,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
|
||||||
|
|
||||||
static int process_resume(void) {
|
static int process_resume(void) {
|
||||||
_cleanup_free_ char *name = NULL, *lnk = NULL;
|
_cleanup_free_ char *name = NULL, *lnk = NULL;
|
||||||
|
const char *opts;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
if (!arg_resume_device)
|
if (!arg_resume_device)
|
||||||
|
@ -66,6 +87,15 @@ static int process_resume(void) {
|
||||||
if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-hibernate-resume@.service", lnk) < 0)
|
if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-hibernate-resume@.service", lnk) < 0)
|
||||||
return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
|
return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
|
||||||
|
|
||||||
|
if (arg_resume_options)
|
||||||
|
opts = arg_resume_options;
|
||||||
|
else
|
||||||
|
opts = arg_root_options;
|
||||||
|
|
||||||
|
r = generator_write_timeouts(arg_dest, arg_resume_device, arg_resume_device, opts, NULL);
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -290,6 +290,7 @@ rd.udev.event_timeout=
|
||||||
rd.udev.exec_delay=
|
rd.udev.exec_delay=
|
||||||
rd.udev.log_priority=
|
rd.udev.log_priority=
|
||||||
resume=
|
resume=
|
||||||
|
resumeflags=
|
||||||
root=
|
root=
|
||||||
rootflags=
|
rootflags=
|
||||||
rootfstype=
|
rootfstype=
|
||||||
|
|
Loading…
Reference in a new issue