diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2024-08-12 13:48:24 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2024-08-12 13:48:24 -0400 |
| commit | 7e4187530a2f735606b51db72363c24a6c85e146 (patch) | |
| tree | 39b3e07de7a25ba5f5444e03d89b73c4055576eb /sys-apps | |
| parent | sys-apps/gentoo-systemd-integration: drop empty IUSE assignment (diff) | |
| download | gentoo-7e4187530a2f735606b51db72363c24a6c85e146.tar.gz gentoo-7e4187530a2f735606b51db72363c24a6c85e146.tar.bz2 gentoo-7e4187530a2f735606b51db72363c24a6c85e146.zip | |
sys-apps/kexec-tools: revert systemd changes for 2.0.28
Closes: https://bugs.gentoo.org/937822
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/kexec-tools/files/kexec.service | 4 | ||||
| -rw-r--r-- | sys-apps/kexec-tools/files/kexec.service-r1 | 16 | ||||
| -rw-r--r-- | sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/kexec-tools/kexec-tools-9999.ebuild | 2 |
4 files changed, 20 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-r1 b/sys-apps/kexec-tools/files/kexec.service-r1 new file mode 100644 index 000000000000..ce9adf0e5da2 --- /dev/null +++ b/sys-apps/kexec-tools/files/kexec.service-r1 @@ -0,0 +1,16 @@ +[Unit] +Description=Gracefully restart the box +Documentation=man:kexec(8) +After=boot.mount +Before=shutdown.target umount.target final.target +ConditionPathExists=!/nokexec + +[Service] +Type=oneshot +RemainAfterExit=yes +EnvironmentFile=/etc/kexec.conf +ExecStart=/usr/sbin/kexec-auto-load +ExecStop=/usr/sbin/kexec-auto-load + +[Install] +WantedBy=multi-user.target 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() { |