MSVSphere Packaging Team
4 months ago
commit
04cc49a0db
GPG Key ID:
B2B0B9F29E528FE8
@ -0,0 +1 @@
|
||||
SOURCES/kdump-utils-1.0.45.tar.gz
|
||||
@ -0,0 +1 @@
|
||||
4d9efbf575365f6a1353323b14068c80f8c627da SOURCES/kdump-utils-1.0.45.tar.gz
|
||||
@ -0,0 +1,44 @@
|
||||
From f6e00948aba7c31f722af79ed72c4020868dcad7 Mon Sep 17 00:00:00 2001
|
||||
From: Tao Liu <ltao@redhat.com>
|
||||
Date: Fri, 18 Oct 2024 21:45:03 +1300
|
||||
Subject: [PATCH] Return the correct exit code of rebuild initrd
|
||||
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-63047
|
||||
|
||||
The exit code of rebuild_initrd() should be either of
|
||||
rebuild_kdump/fadump_initrd(), rather than set_vmcore_creation_status(),
|
||||
otherwise it will cause a regression when rebuild initrd fails.
|
||||
|
||||
Fixes: 88525ebf ("Introduce vmcore creation notification to kdump")
|
||||
|
||||
Signed-off-by: Tao Liu <ltao@redhat.com>
|
||||
---
|
||||
kdumpctl | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/kdumpctl b/kdumpctl
|
||||
index 82b7fb1..0140eeb 100755
|
||||
--- a/kdumpctl
|
||||
+++ b/kdumpctl
|
||||
@@ -173,6 +173,7 @@ rebuild_kdump_initrd()
|
||||
|
||||
rebuild_initrd()
|
||||
{
|
||||
+ local _ret
|
||||
dinfo "Rebuilding $TARGET_INITRD"
|
||||
|
||||
if [[ ! -w $(dirname "$TARGET_INITRD") ]]; then
|
||||
@@ -185,8 +186,10 @@ rebuild_initrd()
|
||||
else
|
||||
rebuild_kdump_initrd
|
||||
fi
|
||||
+ _ret=$?
|
||||
|
||||
set_vmcore_creation_status 'clear' "$VMCORE_CREATION_STATUS"
|
||||
+ return $_ret
|
||||
}
|
||||
|
||||
#$1: the files to be checked with IFS=' '
|
||||
--
|
||||
2.40.1
|
||||
|
||||
@ -0,0 +1,170 @@
|
||||
## START: Set by rpmautospec
|
||||
## (rpmautospec version 0.6.5)
|
||||
## RPMAUTOSPEC: autorelease, autochangelog
|
||||
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||
release_number = 2;
|
||||
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||
print(release_number + base_release_number - 1);
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
||||
## END: Set by rpmautospec
|
||||
|
||||
# kdump-utils has no debug source
|
||||
%global debug_package %{nil}
|
||||
Name: kdump-utils
|
||||
Version:1.0.45
|
||||
Release: %autorelease
|
||||
Summary: Kernel crash dump collection utilities
|
||||
|
||||
License: GPL-2.0-only
|
||||
URL: https://github.com/rhkdump/kdump-utils
|
||||
Source0: https://github.com/rhkdump/kdump-utils/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# Return the correct exit code of rebuild initrd
|
||||
# Author: Tao Liu <ltao@redhat.com>
|
||||
Patch1: 0001-Return-the-correct-exit-code-of-rebuild-initrd.patch
|
||||
|
||||
%ifarch ppc64 ppc64le
|
||||
Requires(post): servicelog
|
||||
Recommends: keyutils
|
||||
%endif
|
||||
Requires(pre): coreutils
|
||||
Requires(pre): sed
|
||||
Requires: kexec-tools >= 2.0.28-8
|
||||
Requires: makedumpfile
|
||||
Requires: dracut >= 058
|
||||
Requires: dracut-network >= 058
|
||||
Requires: dracut-squash >= 058
|
||||
Requires: ethtool
|
||||
Requires: util-linux
|
||||
# Needed for UKI support
|
||||
Recommends: binutils
|
||||
Recommends: grubby
|
||||
Recommends: hostname
|
||||
BuildRequires: make
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
%ifnarch s390x
|
||||
Requires: systemd-udev%{?_isa}
|
||||
%endif
|
||||
%description
|
||||
kdump-utils is responsible for collecting the crash kernel dump. It builds and
|
||||
loads the kdump initramfs so when a kernel crashes, the system will boot the
|
||||
kdump kernel and initramfs to save the collected crash kernel dump to specified
|
||||
target.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%install
|
||||
%make_install sbindir=%_sbindir
|
||||
|
||||
|
||||
%post
|
||||
# don't try to systemctl preset the kdump service for old kexec-tools
|
||||
#
|
||||
# when the old kexec-tools gets removed, this trigger will be excuted to
|
||||
# create a file. So later the posttrans scriptlet will know there is no need to
|
||||
# systemctl preset the kdump service.
|
||||
# This solution can be dropped in F41 when we assume no users will use old
|
||||
# version of kexec-tools.
|
||||
%define kexec_tools_no_preset %{_localstatedir}/lib/rpm-state/kexec-tools.no-preset
|
||||
%triggerun -- kexec-tools
|
||||
touch %{kexec_tools_no_preset}
|
||||
|
||||
touch /etc/kdump.conf
|
||||
|
||||
%ifarch ppc64 ppc64le
|
||||
servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh 2>/dev/null
|
||||
servicelog_notify --add --command=/usr/lib/kdump/kdump-migrate-action.sh --match='refcode="#MIGRATE" and serviceable=0' --type=EVENT --method=pairs_stdin >/dev/null
|
||||
%endif
|
||||
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart kdump.service
|
||||
|
||||
%preun
|
||||
%ifarch ppc64 ppc64le
|
||||
servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh >/dev/null
|
||||
%endif
|
||||
%systemd_preun kdump.service
|
||||
|
||||
%posttrans
|
||||
# don't try to systemctl preset the kdump service for old kexec-tools
|
||||
if [[ -f %{kexec_tools_no_preset} ]]; then
|
||||
# this if branch can be removed in F41 when we assume no users will use the old kexec-tools
|
||||
rm %{kexec_tools_no_preset}
|
||||
else
|
||||
# Initial installation
|
||||
%systemd_post kdump.service
|
||||
fi
|
||||
# Try to reset kernel crashkernel value to new default value or set up
|
||||
# crasherkernel value for new install
|
||||
#
|
||||
# Note
|
||||
# 1. Skip ostree systems as they are not supported.
|
||||
# 2. For Fedora 36 and RHEL9, "[ $1 == 1 ]" in posttrans scriptlet means both install and upgrade;
|
||||
# For Fedora > 36, "[ $1 == 1 ]" only means install and "[ $1 == 2 ]" means upgrade
|
||||
if [ ! -f /run/ostree-booted ] && [ $1 == 1 -o $1 == 2 ]; then
|
||||
kdumpctl _reset-crashkernel-after-update
|
||||
:
|
||||
fi
|
||||
|
||||
%files
|
||||
%ifarch ppc64 ppc64le
|
||||
%{_sbindir}/mkfadumprd
|
||||
%{_prefix}/lib/kernel/install.d/60-fadump.install
|
||||
%endif
|
||||
%{_bindir}/kdumpctl
|
||||
%{_sbindir}/mkdumprd
|
||||
%{_prefix}/lib/kdump
|
||||
%config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump
|
||||
%config(noreplace,missingok) %verify(not mtime) %{_sysconfdir}/kdump.conf
|
||||
%ifnarch s390x
|
||||
%{_udevrulesdir}
|
||||
%{_udevrulesdir}/../kdump-udev-throttler
|
||||
%endif
|
||||
%{_prefix}/lib/dracut/modules.d/*
|
||||
%dir %{_localstatedir}/crash
|
||||
%dir %{_sysconfdir}/kdump
|
||||
%dir %{_sysconfdir}/kdump/pre.d
|
||||
%dir %{_sysconfdir}/kdump/post.d
|
||||
%dir %{_sharedstatedir}/kdump
|
||||
%{_mandir}/man8/kdumpctl.8*
|
||||
%{_mandir}/man8/mkdumprd.8*
|
||||
%{_mandir}/man5/kdump.conf.5*
|
||||
%{_unitdir}/kdump.service
|
||||
%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh
|
||||
%{_prefix}/lib/kernel/install.d/60-kdump.install
|
||||
%{_prefix}/lib/kernel/install.d/92-crashkernel.install
|
||||
%license COPYING
|
||||
%doc kexec-kdump-howto.txt
|
||||
%doc early-kdump-howto.txt
|
||||
%doc fadump-howto.txt
|
||||
%doc kdump-in-cluster-environment.txt
|
||||
%doc live-image-kdump-howto.txt
|
||||
%doc crashkernel-howto.txt
|
||||
%doc supported-kdump-targets.txt
|
||||
|
||||
%changelog
|
||||
## START: Generated by rpmautospec
|
||||
* Sun Oct 20 2024 Tao Liu <ltao@redhat.com> - 1.0.45-2
|
||||
- Return the correct exit code of rebuild initrd
|
||||
|
||||
* Fri Oct 11 2024 Lichen Liu <lichliu@redhat.com> - 1.0.45-1
|
||||
- Rebase to upstream v1.0.45
|
||||
|
||||
* Mon Sep 30 2024 Lichen Liu <lichliu@redhat.com> - 1.0.43-3
|
||||
- Release 1.0.43-2
|
||||
|
||||
* Fri Sep 27 2024 Philipp Rudo <prudo@redhat.com> - 1.0.43-2
|
||||
- Enable erofs support for the kdump initrd
|
||||
|
||||
* Mon Jul 15 2024 Lichen Liu <lichliu@redhat.com> - 1.0.43-1
|
||||
- Release 1.0.43-1
|
||||
|
||||
* Wed Jul 10 2024 Lichen Liu <lichliu@redhat.com> - 1.0.42-2
|
||||
- Enable gating test
|
||||
|
||||
* Wed Jul 10 2024 Lichen Liu <lichliu@redhat.com> - 1.0.42-1
|
||||
- Initial import for CentOS Stream 10
|
||||
## END: Generated by rpmautospec
|
||||
Loading…
Reference in new issue