chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: simplify proc_cmdline() to reuse get_process_cmdline()
[elogind.git]
/
src
/
hibernate-resume
/
hibernate-resume-generator.c
diff --git
a/src/hibernate-resume/hibernate-resume-generator.c
b/src/hibernate-resume/hibernate-resume-generator.c
index f40721662e5bf1a88cb4c70970ecf5f392671de9..41f65d984e3e497b2a0be39497f5c612b8d8d9b2 100644
(file)
--- a/
src/hibernate-resume/hibernate-resume-generator.c
+++ b/
src/hibernate-resume/hibernate-resume-generator.c
@@
-45,6
+45,9
@@
static int parse_proc_cmdline_item(const char *key, const char *value) {
static int process_resume(void) {
_cleanup_free_ char *name = NULL, *lnk = NULL;
static int process_resume(void) {
_cleanup_free_ char *name = NULL, *lnk = NULL;
+ if (!arg_resume_dev)
+ return 0;
+
name = unit_name_from_path_instance("systemd-hibernate-resume", arg_resume_dev, ".service");
if (!name)
return log_oom();
name = unit_name_from_path_instance("systemd-hibernate-resume", arg_resume_dev, ".service");
if (!name)
return log_oom();
@@
-83,12
+86,11
@@
int main(int argc, char *argv[]) {
if (!in_initrd())
return EXIT_SUCCESS;
if (!in_initrd())
return EXIT_SUCCESS;
- if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
- return EXIT_FAILURE;
-
- if (arg_resume_dev != NULL)
- r = process_resume();
+ r = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (r < 0)
+ log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
+ r = process_resume();
free(arg_resume_dev);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
free(arg_resume_dev);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;