summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/kexec-tools/files/kexec.service4
-rw-r--r--sys-apps/kexec-tools/files/kexec.service-r116
-rw-r--r--sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild2
-rw-r--r--sys-apps/kexec-tools/kexec-tools-9999.ebuild2
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() {