commit:     7e4187530a2f735606b51db72363c24a6c85e146
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 17:48:24 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 17:48:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e418753

sys-apps/kexec-tools: revert systemd changes for 2.0.28

Closes: https://bugs.gentoo.org/937822
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/kexec-tools/files/kexec.service                       | 4 ++--
 sys-apps/kexec-tools/files/{kexec.service => kexec.service-r1} | 0
 sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild              | 2 +-
 sys-apps/kexec-tools/kexec-tools-9999.ebuild                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/kexec-tools/files/kexec.service 
b/sys-apps/kexec-tools/files/kexec.service
index ce9adf0e5da2..289aae0df0b1 100644
--- a/sys-apps/kexec-tools/files/kexec.service
+++ b/sys-apps/kexec-tools/files/kexec.service
@@ -9,8 +9,8 @@ ConditionPathExists=!/nokexec
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/kexec.conf
-ExecStart=/usr/sbin/kexec-auto-load
-ExecStop=/usr/sbin/kexec-auto-load
+ExecStart=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
+ExecStop=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
 
 [Install]
 WantedBy=multi-user.target

diff --git a/sys-apps/kexec-tools/files/kexec.service 
b/sys-apps/kexec-tools/files/kexec.service-r1
similarity index 100%
copy from sys-apps/kexec-tools/files/kexec.service
copy to sys-apps/kexec-tools/files/kexec.service-r1

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild 
b/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
index 761057097d28..c8af4693cfed 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
@@ -98,7 +98,7 @@ src_install() {
        dosym ../kexec.conf /etc/conf.d/kexec
 
        dosbin "${FILESDIR}"/kexec-auto-load
-       systemd_dounit "${FILESDIR}"/kexec.service
+       systemd_newunit "${FILESDIR}"/kexec.service-r1 kexec.service
 }
 
 pkg_postinst() {

diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild 
b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 761057097d28..c8af4693cfed 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -98,7 +98,7 @@ src_install() {
        dosym ../kexec.conf /etc/conf.d/kexec
 
        dosbin "${FILESDIR}"/kexec-auto-load
-       systemd_dounit "${FILESDIR}"/kexec.service
+       systemd_newunit "${FILESDIR}"/kexec.service-r1 kexec.service
 }
 
 pkg_postinst() {

Reply via email to