From 782c2652920821fe6b7d5710911630b55f5efcec Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 4 Sep 2014 21:40:00 +0200 Subject: hibernate-resume: let's move all hibernate-resume tools into the same directory They are closely related, so let's move them together, and clean up the .c file naming while we are at it. --- Makefile.am | 2 +- src/hibernate-resume/hibernate-resume-generator.c | 95 +++++++++++++++++++++++ src/resume-generator/Makefile | 1 - src/resume-generator/resume-generator.c | 95 ----------------------- 4 files changed, 96 insertions(+), 97 deletions(-) create mode 100644 src/hibernate-resume/hibernate-resume-generator.c delete mode 120000 src/resume-generator/Makefile delete mode 100644 src/resume-generator/resume-generator.c diff --git a/Makefile.am b/Makefile.am index e534a23886..9c946d7a92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2168,7 +2168,7 @@ systemd_hibernate_resume_LDADD = \ libsystemd-shared.la systemd_hibernate_resume_generator_SOURCES = \ - src/resume-generator/resume-generator.c + src/hibernate-resume/hibernate-resume-generator.c systemd_hibernate_resume_generator_LDADD = \ libsystemd-label.la \ diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c new file mode 100644 index 0000000000..f40721662e --- /dev/null +++ b/src/hibernate-resume/hibernate-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; +} diff --git a/src/resume-generator/Makefile b/src/resume-generator/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/resume-generator/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile \ No newline at end of file diff --git a/src/resume-generator/resume-generator.c b/src/resume-generator/resume-generator.c deleted file mode 100644 index f40721662e..0000000000 --- a/src/resume-generator/resume-generator.c +++ /dev/null @@ -1,95 +0,0 @@ -/*-*- 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; -} -- cgit v1.2.3-54-g00ecf