From 760e99bb52dd132aeab14802c9ed2889471e9cdf Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 19 Apr 2023 01:21:55 +0800 Subject: hibernate-resume: rework to follow the logic of sleep.c and use main-func.h Preparation for #27247 --- units/meson.build | 4 ---- units/systemd-hibernate-resume@.service.in | 22 ---------------------- 2 files changed, 26 deletions(-) delete mode 100644 units/systemd-hibernate-resume@.service.in (limited to 'units') diff --git a/units/meson.build b/units/meson.build index df6da78abe..dff7b3904f 100644 --- a/units/meson.build +++ b/units/meson.build @@ -281,10 +281,6 @@ units = [ { 'file' : 'systemd-growfs-root.service.in' }, { 'file' : 'systemd-growfs@.service.in' }, { 'file' : 'systemd-halt.service' }, - { - 'file' : 'systemd-hibernate-resume@.service.in', - 'conditions' : ['ENABLE_HIBERNATE'], - }, { 'file' : 'systemd-hibernate.service.in', 'conditions' : ['ENABLE_HIBERNATE'], diff --git a/units/systemd-hibernate-resume@.service.in b/units/systemd-hibernate-resume@.service.in deleted file mode 100644 index 142bb339e1..0000000000 --- a/units/systemd-hibernate-resume@.service.in +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# -# 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@.service(8) -DefaultDependencies=no -BindsTo=%i.device -Wants=local-fs-pre.target -After=%i.device -Before=local-fs-pre.target -AssertPathExists=/etc/initrd-release - -[Service] -Type=oneshot -ExecStart={{ROOTLIBEXECDIR}}/systemd-hibernate-resume %f -- cgit v1.2.3