From: Andy Wingo Date: Sun, 19 Apr 2015 11:28:46 +0000 (+0200) Subject: Remove src/hibernate-resume X-Git-Tag: v219.0~123 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=735bbd926f0d654f01d9416c411e7396e23dd17b;hp=d1b3db5c68871085c40a9dfdb36b5919eb28c31d Remove src/hibernate-resume --- diff --git a/src/hibernate-resume/Makefile b/src/hibernate-resume/Makefile deleted file mode 120000 index d0b0e8e00..000000000 --- a/src/hibernate-resume/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile \ No newline at end of file diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c deleted file mode 100644 index 0207346b2..000000000 --- a/src/hibernate-resume/hibernate-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; - - if (!arg_resume_dev) - return 0; - - 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) - return log_error_errno(errno, "Failed to create symlink %s: %m", lnk); - - 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; - - r = parse_proc_cmdline(parse_proc_cmdline_item); - if (r < 0) - log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m"); - - r = process_resume(); - free(arg_resume_dev); - - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c deleted file mode 100644 index 43aac616b..000000000 --- a/src/hibernate-resume/hibernate-resume.c +++ /dev/null @@ -1,83 +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 - -#include "log.h" -#include "util.h" -#include "fileio.h" - -int main(int argc, char *argv[]) { - struct stat st; - const char *device; - _cleanup_free_ char *major_minor = NULL; - int r; - - if (argc != 2) { - log_error("This program expects one argument."); - return EXIT_FAILURE; - } - - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); - - umask(0022); - - /* Refuse to run unless we are in an initrd() */ - if (!in_initrd()) - return EXIT_SUCCESS; - - device = argv[1]; - - if (stat(device, &st) < 0) { - log_error_errno(errno, "Failed to stat '%s': %m", device); - return EXIT_FAILURE; - } - - if (!S_ISBLK(st.st_mode)) { - log_error("Resume device '%s' is not a block device.", device); - return EXIT_FAILURE; - } - - if (asprintf(&major_minor, "%d:%d", major(st.st_rdev), minor(st.st_rdev)) < 0) { - log_oom(); - return EXIT_FAILURE; - } - - r = write_string_file("/sys/power/resume", major_minor); - if (r < 0) { - log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); - return EXIT_FAILURE; - } - - /* - * The write above shall not return. - * - * However, failed resume is a normal condition (may mean that there is - * no hibernation image). - */ - - log_info("Could not resume from '%s' (%s).", device, major_minor); - return EXIT_SUCCESS; -}