Resolves: https://issues.redhat.com/browse/RHEL-63071
Conflict: None
Upstream Status: git@github.com:rhkdump/kdump-utils.git
commit c196f5b9ebacbd60ef61ab20bfe399065e2de96b
Author: Coiby Xu <coxu@redhat.com>
Date: Wed Oct 23 10:48:05 2024 +0800
Set up crashkernel value for osbuild
Resolves: https://issues.redhat.com/browse/RHEL-63071
Currently the cloud image built by osbuild doesn't have crashkernel set
up. Since kdumpctl will set up crashkernel only when kdump.service is
enabled, it will fail if it's done in the following order
-> kernel's %posttrans scriptlet
-> 92-crashkernel.install
-> kdumpctl _reset-crashkernel-for-installed_kernel
-> kdump-utils' %post scriptlet enables kdump.serivce
This patch now let "systemd preset" kdump.service in the %post scriptlet
instead. So when the kernel's %posttrans scriptlet is running, kdump.service
is already enabled. %posttrans runs after all packages' %post
scriptlets have been executed [1], so now crashkernel is set up in the
following order,
kdump-utils' post scriptlet which "systemd preset" kdump.service
-> kernel's posttrans RPM scriptlet
-> 92-crashkernel.install
-> kdumpctl _reset-crashkernel-for-installed_kernel
And we expect users have now upgraded to kdump-utils so there
is no need for the solution introduced in commit 5fe098fe.
Note an agreement has been reached between kdump-utils and osbuild in
https://bugzilla.redhat.com/show_bug.cgi?id=2024976 that kdump-utils
will be responsible for setting up the crashkernel kernel parameter. And
since kdump-utils will only set up crashkernel when kdump.service is
enabled, we need to make sure kdump.service is enabled in the systemd
preset.
[1] https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#ordering
Fixes: 5fe098fe ("Don't systemctl preset kdump when updating kexec-tools to kdump-utils")
Signed-off-by: Coiby Xu <coxu@redhat.com>
Signed-off-by: Coiby Xu <coxu@redhat.com>
Related: RHEL-29941
Upstream: Fedora
Conflict: None
commit f6e00948aba7c31f722af79ed72c4020868dcad7
Author: Tao Liu <ltao@redhat.com>
Date: Fri Oct 18 21:45:03 2024 +1300
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>
Signed-off-by: Tao Liu <ltao@redhat.com>
Resolves: RHEL-50942
Upstream: https://github.com/rhkdump/kdump-utils.git
Conflict: Dropped hunks concerning OVS bridge support in patch 3 and 5
due to missing 224d310 ("Support setting up Open vSwitch
(Ovs) Bridge network")
Also contains upstream commit
commit 2970176d9e9b7b6a1191a9ee54423d2f1c56fbaf
Author: Philipp Rudo <prudo@redhat.com>
Date: Tue Sep 24 10:39:32 2024 +0200
spec: fix patching of files in subdirectories
With 23df04b ("dracut: create sub-directories for dracut modules") the
dracut modules were moved to subdirectories. This causes problems when
someone wants to include a patch to the spec file to change one of the
files in those subdirectories. Reason is that '%autosetup' in the spec
file calls 'patch' per default. 'patch' however, will strip all
directories when it is called without option -p. Which means that it
will search the file in the root directory and then fail because it
cannot find it. Thus add option -p1 to '%autosetup' which will be passed
on to 'patch'. Choose -p1 as that will work with the most common patch
creation tools like git and packit.
Signed-off-by: Philipp Rudo <prudo@redhat.com>
Signed-off-by: Philipp Rudo <prudo@redhat.com>
