From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CFCC2159C9B for ; Mon, 12 Aug 2024 17:49:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 033CCE2C13; Mon, 12 Aug 2024 17:49:15 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC02AE2C13 for ; Mon, 12 Aug 2024 17:49:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BA9F341214 for ; Mon, 12 Aug 2024 17:49:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D53B1EBC for ; Mon, 12 Aug 2024 17:49:12 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1723484904.7e4187530a2f735606b51db72363c24a6c85e146.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/kexec-tools/files/kexec.service sys-apps/kexec-tools/files/kexec.service-r1 sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild sys-apps/kexec-tools/kexec-tools-9999.ebuild X-VCS-Directories: sys-apps/kexec-tools/ sys-apps/kexec-tools/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 7e4187530a2f735606b51db72363c24a6c85e146 X-VCS-Branch: master Date: Mon, 12 Aug 2024 17:49:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 58528a85-1801-4a90-98a9-f3522b2483cd X-Archives-Hash: 23e24b93ccd4c7d6606c50b553528a52 commit: 7e4187530a2f735606b51db72363c24a6c85e146 Author: Mike Gilbert gentoo org> AuthorDate: Mon Aug 12 17:48:24 2024 +0000 Commit: Mike Gilbert gentoo 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 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() {