From d2c68822c47e37b582820f45b496b2e7d1f9e642 Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Wed, 27 Aug 2014 00:17:45 +0400 Subject: [PATCH] hibernate-resume-generator: add a generator for instantiating the resume unit. hibernate-resume-generator understands resume= kernel command line parameter and instantiates the systemd-resume@.service accordingly if it is passed. This enables resume from hibernation using device specified on the kernel command line, and it may be specified either as "/dev/disk/by-foo/bar" or "FOO=bar", not only "/dev/sdXY" which is understood by the in-kernel implementation. So now resume= is brought on par with root= in terms of possible ways to specify a device. --- .gitignore | 1 + Makefile-man.am | 2 + Makefile.am | 11 +++- man/kernel-command-line.xml | 14 ++++- man/systemd-hibernate-resume-generator.xml | 93 +++++++++++++++++++++++++++++ src/resume-generator/Makefile | 1 + src/resume-generator/resume-generator.c | 95 ++++++++++++++++++++++++++++++ 7 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 man/systemd-hibernate-resume-generator.xml create mode 120000 src/resume-generator/Makefile create mode 100644 src/resume-generator/resume-generator.c diff --git a/.gitignore b/.gitignore index 0b5608ccf9..8aed0b9ba6 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,7 @@ /systemd-gnome-ask-password-agent /systemd-gpt-auto-generator /systemd-hibernate-resume +/systemd-hibernate-resume-generator /systemd-hostnamed /systemd-inhibit /systemd-initctl diff --git a/Makefile-man.am b/Makefile-man.am index 09a10383a9..5c27937152 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -70,6 +70,7 @@ MANPAGES += \ man/systemd-getty-generator.8 \ man/systemd-gpt-auto-generator.8 \ man/systemd-halt.service.8 \ + man/systemd-hibernate-resume-generator.8 \ man/systemd-hibernate-resume@.service.8 \ man/systemd-inhibit.1 \ man/systemd-initctl.service.8 \ @@ -1625,6 +1626,7 @@ EXTRA_DIST += \ man/systemd-getty-generator.xml \ man/systemd-gpt-auto-generator.xml \ man/systemd-halt.service.xml \ + man/systemd-hibernate-resume-generator.xml \ man/systemd-hibernate-resume@.service.xml \ man/systemd-hostnamed.service.xml \ man/systemd-inhibit.xml \ diff --git a/Makefile.am b/Makefile.am index a487caa7bc..cbdf551fa8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -385,7 +385,8 @@ systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ systemd-system-update-generator \ - systemd-debug-generator + systemd-debug-generator \ + systemd-hibernate-resume-generator dist_bashcompletion_DATA = \ shell-completion/bash/busctl \ @@ -2146,6 +2147,14 @@ systemd_system_update_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_hibernate_resume_generator_SOURCES = \ + src/resume-generator/resume-generator.c + +systemd_hibernate_resume_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + if ENABLE_EFI # ------------------------------------------------------------------------------ systemgenerator_PROGRAMS += \ diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 36428aaa94..d872e6d5b9 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -351,6 +351,17 @@ + + resume= + + + Enables resume from hibernation + using the specified device. + All fstab5-like + pathes are supported. For details, see + systemd-hibernate-resume-generator8. + + @@ -373,7 +384,8 @@ systemd-gpt-auto-generator8, systemd-modules-load.service8, systemd-backlight@.service8, - systemd-rfkill@.service8 + systemd-rfkill@.service8, + systemd-hibernate-resume-generator8 diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml new file mode 100644 index 0000000000..1a4b99ced4 --- /dev/null +++ b/man/systemd-hibernate-resume-generator.xml @@ -0,0 +1,93 @@ + + + + + + + + systemd-hibernate-resume-generator + systemd + + + + Developer + Ivan + Shapovalov + intelfx100@gmail.com + + + + + + systemd-hibernate-resume-generator + 8 + + + + systemd-hibernate-resume-generator + Unit generator for resume= kernel parameter + + + + /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + + + + Description + + systemd-hibernate-resume-generator is + a generator that instantiates + systemd-hibernate-resume@.service8 + unit according to the value of + parameter specified on the kernel command line. + + + + Kernel Command Line + + systemd-hibernate-resume-generator understands + the following kernel command line parameters: + + + + + resume= + + Takes a path to the resume + device. Both persistent block device pathes like + /dev/disk/by-foo/bar and + fstab5-style + specifiers like FOO=bar + are supported. + + + + + + + See Also + + systemd1, + systemd-hibernate-resume@.service8, + kernel-command-line7 + + + + diff --git a/src/resume-generator/Makefile b/src/resume-generator/Makefile new file mode 120000 index 0000000000..d0b0e8e008 --- /dev/null +++ b/src/resume-generator/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/src/resume-generator/resume-generator.c b/src/resume-generator/resume-generator.c new file mode 100644 index 0000000000..f40721662e --- /dev/null +++ b/src/resume-generator/resume-generator.c @@ -0,0 +1,95 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2014 Ivan Shapovalov + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include + +#include "log.h" +#include "util.h" +#include "special.h" +#include "mkdir.h" +#include "unit-name.h" + +static const char *arg_dest = "/tmp"; +static char *arg_resume_dev = NULL; + +static int parse_proc_cmdline_item(const char *key, const char *value) { + if (streq(key, "resume") && value) { + free(arg_resume_dev); + arg_resume_dev = fstab_node_to_udev_node(value); + if (!arg_resume_dev) + return log_oom(); + } + + return 0; +} + +static int process_resume(void) { + _cleanup_free_ char *name = NULL, *lnk = NULL; + + name = unit_name_from_path_instance("systemd-hibernate-resume", arg_resume_dev, ".service"); + if (!name) + return log_oom(); + + lnk = strjoin(arg_dest, "/" SPECIAL_SYSINIT_TARGET ".wants/", name, NULL); + if (!lnk) + return log_oom(); + + mkdir_parents_label(lnk, 0755); + if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-hibernate-resume@.service", lnk) < 0) { + log_error("Failed to create symlink %s: %m", lnk); + return -errno; + } + + return 0; +} + +int main(int argc, char *argv[]) { + int r = 0; + + if (argc > 1 && argc != 4) { + log_error("This program takes three or no arguments."); + return EXIT_FAILURE; + } + + if (argc > 1) + arg_dest = argv[1]; + + log_set_target(LOG_TARGET_SAFE); + log_parse_environment(); + log_open(); + + umask(0022); + + /* Don't even consider resuming outside of initramfs. */ + 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(); + + free(arg_resume_dev); + + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +}