From ec53fb983dcdd7f46967e86e800934b0300247fa Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Fri, 3 Dec 2021 18:14:03 +0800 Subject: [PATCH] kdump/ppc64: migration action registration clean up resolves: bz2027568 upstream: fedora conflict: None-functional conflict in spec file. commit 146f66262222e96bca47b691ed243fa5097aa55c Author: Hari Bathini Date: Tue Jul 27 23:59:48 2021 +0530 kdump/ppc64: migration action registration clean up While kdump migration action is registered for LPM event, ensure it is cleared as appropriate to avoid duplicate/stale notification entries. Signed-off-by: Hari Bathini Acked-by: Kairui Song Signed-off-by: Tao Liu --- kexec-tools.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kexec-tools.spec b/kexec-tools.spec index 038bd9f..fcc2167 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -271,11 +271,10 @@ mv $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/* $RPM_BUILD_ROOT/%{d touch /etc/kdump.conf -ARCH=`uname -m` -if [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "ppc64le" ] -then - servicelog_notify --add --command=/usr/lib/kdump/kdump-migrate-action.sh --match='refcode="#MIGRATE" and serviceable=0' --type=EVENT --method=pairs_stdin -fi +%ifarch ppc64 ppc64le +servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh +servicelog_notify --add --command=/usr/lib/kdump/kdump-migrate-action.sh --match='refcode="#MIGRATE" and serviceable=0' --type=EVENT --method=pairs_stdin +%endif # This portion of the script is temporary. Its only here # to fix up broken boxes that require special settings @@ -305,6 +304,9 @@ fi %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