system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-11-05 18:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

hibernate-resume: add resumeflags= kernel option

Browse source 
Adds the resumeflags= kernel command line option to allow setting a
custom device timeout for the resume device (defaults to the same as the
root device).
This commit is contained in:
Jonathan Rouleau 2019-06-05 18:59:05 -06:00
parent 70e843fe92
commit 8b6805a25b
4 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
man/kernel-command-line.xml
View file

@ -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>

7
man/systemd-hibernate-resume-generator.xml
View file

@ -55,6 +55,13 @@
supported.</para></listitem>
</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>

18
src/hibernate-resume/hibernate-resume-generator.c
View file

@ -17,10 +17,12 @@
static const char *arg_dest = "/tmp";
static char *arg_resume_device = NULL;
static char *arg_resume_options = NULL;
static char *arg_root_options = NULL;
static bool arg_noresume = false;
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) {
@ -37,6 +39,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
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))
@ -59,6 +69,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
static int process_resume(void) {
_cleanup_free_ char *name = NULL, *lnk = NULL;
const char *opts;
int r;
if (!arg_resume_device)
@ -76,7 +87,12 @@ static int process_resume(void) {
if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-hibernate-resume@.service", lnk) < 0)
return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
r = generator_write_timeouts(arg_dest, arg_resume_device, arg_resume_device, arg_root_options, NULL);
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;

1
test/fuzz/fuzz-unit-file/directives.service
View file

@ -290,6 +290,7 @@ rd.udev.event_timeout=
rd.udev.exec_delay=
rd.udev.log_priority=
resume=
resumeflags=
root=
rootflags=
rootfstype=