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>
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From f2e4123828e8b0fd02c87fcc62089ee68891bf7d Mon Sep 17 00:00:00 2001
|
|
From: Philipp Rudo <prudo@redhat.com>
|
|
Date: Wed, 14 Aug 2024 12:39:28 +0200
|
|
Subject: [PATCH 10/16] mkfadumprd: fix shellcheck warnings
|
|
|
|
Fix the shellcheck warnings for mkfadumprd. With this
|
|
|
|
$ shellcheck -x mkfadumprd
|
|
|
|
now returns without finding.
|
|
|
|
Signed-off-by: Philipp Rudo <prudo@redhat.com>
|
|
---
|
|
mkfadumprd | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/mkfadumprd b/mkfadumprd
|
|
index dd6840f..2fd09ad 100755
|
|
--- a/mkfadumprd
|
|
+++ b/mkfadumprd
|
|
@@ -7,8 +7,11 @@ if [[ -f /etc/sysconfig/kdump ]]; then
|
|
fi
|
|
|
|
[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
|
|
-. $dracutbasedir/dracut-functions.sh
|
|
+# shellcheck source=/dev/null
|
|
+. "$dracutbasedir"/dracut-functions.sh
|
|
+# shellcheck source=SCRIPTDIR/kdump-lib.sh
|
|
. /lib/kdump/kdump-lib.sh
|
|
+# shellcheck source=SCRIPTDIR/kdump-logger.sh
|
|
. /lib/kdump/kdump-logger.sh
|
|
|
|
#initiate the kdump logger
|
|
@@ -19,6 +22,7 @@ fi
|
|
|
|
MKFADUMPRD_TMPDIR="$(mktemp -d -t mkfadumprd.XXXXXX)"
|
|
[ -d "$MKFADUMPRD_TMPDIR" ] || perror_exit "mkfadumprd: mktemp -d -t mkfadumprd.XXXXXX failed."
|
|
+# shellcheck disable=SC2154
|
|
trap '
|
|
ret=$?;
|
|
[[ -d $MKFADUMPRD_TMPDIR ]] && rm --one-file-system -rf -- "$MKFADUMPRD_TMPDIR";
|
|
--
|
|
2.46.1
|
|
|