From edb8691a8e10181fa7a9ddc1b0948efdf2caa6f8 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Tue, 7 Dec 2021 20:38:25 +0800 Subject: [PATCH] Remove references to systemd-sysv-convert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit upstream: fedora related: bz2003832 conflict: yes, non-functional modification made commit c894022e9b95390c700bfaf59b5a29311c69b896 Author: Zbigniew Jędrzejewski-Szmek Date: Tue Jun 1 10:15:11 2021 +0200 Remove references to systemd-sysv-convert Packaging guidelines have been amended to not require systemd for scriptlets, see https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_scriptlets. The comment duplicates what the macro contains. systemd-sysv-convert binary was removed in 2013, trying to call it is unlikely to succeed. chkconfig binary is provided by the chkconfig package, which is not in Requires. (And makes little sense to call nowadays anyway.) Signed-off-by: Tao Liu --- kexec-tools.spec | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/kexec-tools.spec b/kexec-tools.spec index aab9103..180a94c 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -62,9 +62,6 @@ Source109: dracut-early-kdump-module-setup.sh Source200: dracut-fadump-init-fadump.sh Source201: dracut-fadump-module-setup.sh -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units %ifarch ppc64 ppc64le Requires(post): servicelog Recommends: keyutils @@ -78,7 +75,7 @@ Recommends: grubby BuildRequires: make BuildRequires: zlib-devel elfutils-devel glib2-devel bzip2-devel ncurses-devel bison flex lzo-devel snappy-devel libzstd-devel BuildRequires: pkgconfig intltool gettext -BuildRequires: systemd-units +BuildRequires: systemd-rpm-macros BuildRequires: automake autoconf libtool %ifarch %{ix86} x86_64 ppc64 ppc s390x ppc64le Obsoletes: diskdumputils netdump kexec-tools-eppic @@ -303,23 +300,11 @@ fi %systemd_postun_with_restart kdump.service %preun -# Package removal, not upgrade %ifarch ppc64 ppc64le servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh %endif %systemd_preun kdump.service -%triggerun -- kexec-tools < 2.0.2-3 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply kdump -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save kdump >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del kdump >/dev/null 2>&1 || : -/bin/systemctl try-restart kdump.service >/dev/null 2>&1 || : - - %triggerin -- kernel-kdump touch %{_sysconfdir}/kdump.conf