system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-23 19:25:39 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

hibernate-resume: refuse resume if resume_offset= is set but not resume=

Browse source
This commit is contained in:
Mike Yuan 2023-07-09 06:10:18 +08:00 committed by Luca Boccassi
parent 906682a1de
commit c089af84c4
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@ static char *arg_resume_options = NULL;
static char *arg_root_options = NULL;
static bool arg_noresume = false;
static uint64_t arg_resume_offset = 0;
static bool arg_resume_offset_set = false;
STATIC_DESTRUCTOR_REGISTER(arg_resume_device, freep);
STATIC_DESTRUCTOR_REGISTER(arg_resume_options, freep);
@ -73,6 +74,8 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
if (r < 0)
return log_error_errno(r, "Failed to parse resume_offset=%s: %m", value);
arg_resume_offset_set = true;
} else if (proc_cmdline_key_streq(key, "resumeflags")) {
if (proc_cmdline_value_missing(key, value))
@ -263,6 +266,11 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
return 0;
}
if (!arg_resume_device && arg_resume_offset_set)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Found resume_offset=%" PRIu64 " but resume= is unset, refusing.",
arg_resume_offset);
r = parse_efi_hibernate_location();
if (r == -ENOMEM)
return r;