d38412baaf
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>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 7fb90ad5fa3de5248f2fe9cd37a6af839788ef4d Mon Sep 17 00:00:00 2001
|
|
From: Philipp Rudo <prudo@redhat.com>
|
|
Date: Tue, 13 Aug 2024 18:52:51 +0200
|
|
Subject: [PATCH 13/16] 99kdumpbase: drop check for lvmthinpool-monitor module
|
|
|
|
The lvmthinpool-moitor module was added with dracut 057 but the minimal
|
|
required dracut version in the Fedora spec file is dracut >=058. So we
|
|
can safely assume that the module is always present.
|
|
|
|
Signed-off-by: Philipp Rudo <prudo@redhat.com>
|
|
---
|
|
dracut/99kdumpbase/module-setup.sh | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/dracut/99kdumpbase/module-setup.sh b/dracut/99kdumpbase/module-setup.sh
|
|
index 70dc8ca..7508851 100755
|
|
--- a/dracut/99kdumpbase/module-setup.sh
|
|
+++ b/dracut/99kdumpbase/module-setup.sh
|
|
@@ -59,11 +59,7 @@ depends() {
|
|
fi
|
|
|
|
if is_lvm2_thinp_dump_target; then
|
|
- if grep -q lvmthinpool-monitor <<< "$(dracut --list-modules)"; then
|
|
- add_opt_module lvmthinpool-monitor
|
|
- else
|
|
- dwarning "Required lvmthinpool-monitor modules is missing! Please upgrade dracut >= 057."
|
|
- fi
|
|
+ add_opt_module lvmthinpool-monitor
|
|
fi
|
|
|
|
if [[ "$(uname -m)" == "s390x" ]]; then
|
|
--
|
|
2.46.1
|
|
|