summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/hibernate-resume/hibernate-resume-generator.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
index 02eb0c9a51..f3b668ccda 100644
--- a/src/hibernate-resume/hibernate-resume-generator.c
+++ b/src/hibernate-resume/hibernate-resume-generator.c
@@ -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;
}