[systemd-devel] [PATCHv5 2/3] hibernate-resume: add a tool to write a device node's major:minor to /sys/power/resume.

Ivan Shapovalov intelfx100 at gmail.com
Tue Aug 26 12:53:16 PDT 2014


This can be used to initiate a resume from hibernation by path to a swap
device containing the hibernation image.

The respective templated unit is also added. It is instantiated using
path to the desired resume device.
---
 .gitignore                                 |  1 +
 Makefile-man.am                            |  7 +++
 Makefile.am                                | 17 +++++--
 man/systemd-hibernate-resume at .service.xml  | 81 ++++++++++++++++++++++++++++++
 src/hibernate-resume/Makefile              |  1 +
 src/hibernate-resume/hibernate-resume.c    | 81 ++++++++++++++++++++++++++++++
 units/.gitignore                           |  1 +
 units/systemd-hibernate-resume at .service.in | 20 ++++++++
 8 files changed, 206 insertions(+), 3 deletions(-)
 create mode 100644 man/systemd-hibernate-resume at .service.xml
 create mode 120000 src/hibernate-resume/Makefile
 create mode 100644 src/hibernate-resume/hibernate-resume.c
 create mode 100644 units/systemd-hibernate-resume at .service.in

diff --git a/.gitignore b/.gitignore
index 9523ea0..35bdec5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@
 /systemd-getty-generator
 /systemd-gnome-ask-password-agent
 /systemd-gpt-auto-generator
+/systemd-hibernate-resume
 /systemd-hostnamed
 /systemd-inhibit
 /systemd-initctl
diff --git a/Makefile-man.am b/Makefile-man.am
index 5c289dd..843b793 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -68,6 +68,7 @@ MANPAGES += \
 	man/systemd-getty-generator.8 \
 	man/systemd-gpt-auto-generator.8 \
 	man/systemd-halt.service.8 \
+	man/systemd-hibernate-resume at .service.8 \
 	man/systemd-inhibit.1 \
 	man/systemd-initctl.service.8 \
 	man/systemd-journald.service.8 \
@@ -195,6 +196,7 @@ MANPAGES_ALIAS += \
 	man/systemd-ask-password-wall.service.8 \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-fsck.8 \
+	man/systemd-hibernate-resume.8 \
 	man/systemd-hibernate.service.8 \
 	man/systemd-hybrid-sleep.service.8 \
 	man/systemd-initctl.8 \
@@ -300,6 +302,7 @@ man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck at .service.8
 man/systemd-fsck.8: man/systemd-fsck at .service.8
+man/systemd-hibernate-resume.8: man/systemd-hibernate-resume at .service.8
 man/systemd-hibernate.service.8: man/systemd-suspend.service.8
 man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
 man/systemd-initctl.8: man/systemd-initctl.service.8
@@ -559,6 +562,9 @@ man/systemd-fsck-root.service.html: man/systemd-fsck at .service.html
 man/systemd-fsck.html: man/systemd-fsck at .service.html
 	$(html-alias)
 
+man/systemd-hibernate-resume.html: man/systemd-hibernate-resume at .service.html
+	$(html-alias)
+
 man/systemd-hibernate.service.html: man/systemd-suspend.service.html
 	$(html-alias)
 
@@ -1605,6 +1611,7 @@ EXTRA_DIST += \
 	man/systemd-getty-generator.xml \
 	man/systemd-gpt-auto-generator.xml \
 	man/systemd-halt.service.xml \
+	man/systemd-hibernate-resume at .service.xml \
 	man/systemd-hostnamed.service.xml \
 	man/systemd-inhibit.xml \
 	man/systemd-initctl.service.xml \
diff --git a/Makefile.am b/Makefile.am
index e238cde..5ed3ae1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -371,7 +371,8 @@ rootlibexec_PROGRAMS = \
 	systemd-sleep \
 	systemd-bus-proxyd \
 	systemd-socket-proxyd \
-	systemd-update-done
+	systemd-update-done \
+	systemd-hibernate-resume
 
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
@@ -509,7 +510,8 @@ nodist_systemunit_DATA = \
 	units/initrd-udevadm-cleanup-db.service \
 	units/initrd-switch-root.service \
 	units/systemd-nspawn at .service \
-	units/systemd-update-done.service
+	units/systemd-update-done.service \
+	units/systemd-hibernate-resume at .service
 
 dist_userunit_DATA = \
 	units/user/basic.target \
@@ -556,7 +558,8 @@ EXTRA_DIST += \
 	units/initrd-udevadm-cleanup-db.service.in \
 	units/initrd-switch-root.service.in \
 	units/systemd-nspawn at .service.in \
-	units/systemd-update-done.service.in
+	units/systemd-update-done.service.in \
+	units/systemd-hibernate-resume at .service.in
 
 CLEANFILES += \
 	units/console-shell.service.m4 \
@@ -1930,6 +1933,14 @@ systemd_delta_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+systemd_hibernate_resume_SOURCES = \
+	src/hibernate-resume/hibernate-resume.c
+
+systemd_hibernate_resume_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
 	src/getty-generator/getty-generator.c
 
diff --git a/man/systemd-hibernate-resume at .service.xml b/man/systemd-hibernate-resume at .service.xml
new file mode 100644
index 0000000..9b188b0
--- /dev/null
+++ b/man/systemd-hibernate-resume at .service.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!--
+  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 <http://www.gnu.org/licenses/>.
+-->
+<refentry id="systemd-hibernate-resume at .service">
+
+        <refentryinfo>
+                <title>systemd-hibernate-resume at .service</title>
+                <productname>systemd</productname>
+
+                <authorgroup>
+                        <author>
+                                <contrib>Developer</contrib>
+                                <firstname>Ivan</firstname>
+                                <surname>Shapovalov</surname>
+                                <email>intelfx100 at gmail.com</email>
+                        </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>systemd-hibernate-resume at .service</refentrytitle>
+                <manvolnum>8</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>systemd-hibernate-resume at .service</refname>
+                <refname>systemd-hibernate-resume</refname>
+                <refpurpose>Resume from hibernation</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <para><filename>systemd-hibernate-resume at .service</filename></para>
+                <para><filename>/usr/lib/systemd/systemd-hibernate-resume</filename></para>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para><filename>systemd-hibernate-resume at .service</filename> is a
+                service that initiates hibernation resume from a device
+                containing the resume image. It is instantiated for each
+                device that is configured for resuming from.</para>
+
+                <para><filename>systemd-hibernate-resume</filename> only supports
+                the in-kernel hibernation implementation, known as swsusp.
+                Internally, it works by writing the major:minor of specified
+                device node to <filename>/sys/power/resume</filename>.</para>
+
+                <para>Failing to initiate a resume is not an error condition.
+                It may mean that there was no resume image (e. g. if the
+                system has been simply powered off and not hibernated). In
+                such case, the boot is ordinarily continued.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+
+</refentry>
diff --git a/src/hibernate-resume/Makefile b/src/hibernate-resume/Makefile
new file mode 120000
index 0000000..d0b0e8e
--- /dev/null
+++ b/src/hibernate-resume/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
new file mode 100644
index 0000000..8f68f81
--- /dev/null
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -0,0 +1,81 @@
+/*-*- 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 <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#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);
+
+        device = argv[1];
+
+        if (stat(device, &st) < 0) {
+                log_error("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("Failed to write '%s' to /sys/power/resume: %s", major_minor, strerror(-r));
+                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;
+}
diff --git a/units/.gitignore b/units/.gitignore
index 8ae6ca8..afb5caf 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -51,6 +51,7 @@
 /systemd-reboot.service
 /systemd-remount-fs.service
 /systemd-resolved.service
+/systemd-hibernate-resume at .service
 /systemd-rfkill at .service
 /systemd-shutdownd.service
 /systemd-suspend.service
diff --git a/units/systemd-hibernate-resume at .service.in b/units/systemd-hibernate-resume at .service.in
new file mode 100644
index 0000000..6db584d
--- /dev/null
+++ b/units/systemd-hibernate-resume at .service.in
@@ -0,0 +1,20 @@
+#  This file is part of systemd.
+#
+#  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.
+
+[Unit]
+Description=Resume from hibernation using device %f
+Documentation=man:systemd-hibernate-resume at .service(8)
+DefaultDependencies=no
+BindsTo=%i.device
+Wants=local-fs-pre.target
+After=%i.device
+Before=local-fs-pre.target systemd-remount-fs.service systemd-fsck-root.service
+ConditionPathExists=/etc/initrd-release
+
+[Service]
+Type=oneshot
+ExecStart=@rootlibexecdir@/systemd-hibernate-resume %f
-- 
2.1.0



More information about the systemd-devel mailing list