mirror of
https://github.com/systemd/systemd
synced 2024-10-07 00:30:59 +00:00
hibernate-resume: fix resume device timeout
Fixes #7242 Sets the systemd device timeout for the resume device to the same as the root device. This prevents systemd-hibernate-resume@.service from silently timing out and booting into a fresh session instead of the saved hibernation state when the user is using luks, has set rootflags=x-systemd.device-timeout=X to longer than the default timeout, and the luks password is entered after the default timeout.
This commit is contained in:
parent
c0d11245d2
commit
70e843fe92
|
@ -17,9 +17,11 @@
|
|||
|
||||
static const char *arg_dest = "/tmp";
|
||||
static char *arg_resume_device = NULL;
|
||||
static char *arg_root_options = NULL;
|
||||
static bool arg_noresume = false;
|
||||
|
||||
STATIC_DESTRUCTOR_REGISTER(arg_resume_device, freep);
|
||||
STATIC_DESTRUCTOR_REGISTER(arg_root_options, freep);
|
||||
|
||||
static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
|
||||
|
||||
|
@ -35,6 +37,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, "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")) {
|
||||
if (value) {
|
||||
log_warning("\"noresume\" kernel command line switch specified with an argument, ignoring.");
|
||||
|
@ -66,6 +76,10 @@ 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 (r < 0)
|
||||
return r;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue