forked from pool/kdump
8c4cc920f8
- kdump-calibrate-Update-values.patch: calibrate: Update values. - kdump-prefer-by-path-and-device-mapper.patch: Prefer by-path and device-mapper aliases over kernel device names (bsc#1101149, LTC#168532). - kdump-powerpc-no-reload-on-CPU-removal.patch: powerpc: Do not reload on CPU hot removal (bsc#1133407, LTC#176111). - kdump-Add-force-option-to-KDUMP_NETCONFIG.patch: Add ":force" option to KDUMP_NETCONFIG (bsc#1108919). - kdump-Add-fence_kdump_send-when-fence-agents-installed.patch: Add fence_kdump_send when fence-agents installed (bsc#1108919). - kdump-FENCE_KDUMP_SEND-variable.patch: Use var for path of fence_kdump_send and remove the unnecessary PRESCRIPT check (bsc#1108919). - kdump-Document-fence_kdump_send.patch: Document kdump behaviour for fence_kdump_send (bsc#1108919). - kdump-nss-modules.patch: Improve the handling of NSS (bsc#1021846). - kdump-skip-mounts-if-no-proc-vmcore.patch: Skip kdump-related mounts if there is no /proc/vmcore (bsc#1102252, bsc#1125011). - kdump-clean-up-kdump-mount-points.patch: Make sure that kdump mount points are cleaned up (bsc#1102252, bsc#1125011). - kdump-Clean-up-the-use-of-current-vs-boot-network-iface.patch: Clean up the use of current vs. boot network interface names (bsc#1094444, bsc#1116463, bsc#1141064). - kdump-Use-a-custom-namespace-for-physical-NICs.patch: Use a custom namespace for physical NICs (bsc#1094444, bsc#1116463, bsc#1141064). - kdump-preserve-white-space.patch: Preserve white space when removing kernel command line options (bsc#1117652). OBS-URL: https://build.opensuse.org/request/show/757490 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=188
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From: Nick Wang <nwang@suse.com>
|
|
Date: Fri, 30 Nov 2018 10:03:17 +0800
|
|
Subject: Use var for path of fence_kdump_send and remove the unnecessary PRESCRIPT check
|
|
References: bsc#1108919
|
|
Upstream: merged
|
|
Git-commit: f69533d0d8e974b8c27a2c9a651fb9e98c16194b
|
|
|
|
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
|
|
|
|
---
|
|
init/module-setup.sh | 5 ++---
|
|
init/setup-kdump.functions | 8 ++++----
|
|
2 files changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
--- a/init/module-setup.sh
|
|
+++ b/init/module-setup.sh
|
|
@@ -25,9 +25,8 @@ kdump_check_net() {
|
|
elif [ "${KDUMP_NETCONFIG%:force}" != "$KDUMP_NETCONFIG" ]; then
|
|
# always set up network
|
|
kdump_neednet=y
|
|
- elif [ -f "/usr/lib/fence_kdump_send" ] &&
|
|
- ( [[ $KDUMP_PRESCRIPT =~ "fence_kdump_send" ]] || \
|
|
- [[ $KDUMP_POSTSCRIPT =~ "fence_kdump_send" ]] ) ; then
|
|
+ elif [ -f "$FENCE_KDUMP_SEND" ] &&
|
|
+ [[ $KDUMP_POSTSCRIPT =~ "$FENCE_KDUMP_SEND" ]] ; then
|
|
# setup network when fence_kdump_send included and configured
|
|
kdump_neednet=y
|
|
else
|
|
--- a/init/setup-kdump.functions
|
|
+++ b/init/setup-kdump.functions
|
|
@@ -10,6 +10,7 @@
|
|
#
|
|
|
|
KDUMP_CONFIG=/etc/sysconfig/kdump
|
|
+FENCE_KDUMP_SEND=/usr/lib/fence_kdump_send
|
|
|
|
#
|
|
# Global variables
|
|
@@ -918,10 +919,9 @@ function kdump_modify_config() #
|
|
fi
|
|
|
|
# copy fence_kdump_send if exists
|
|
- if [ -f "/usr/lib/fence_kdump_send" ] &&
|
|
- ( [[ $KDUMP_PRESCRIPT =~ "fence_kdump_send" ]] ||
|
|
- [[ $KDUMP_POSTSCRIPT =~ "fence_kdump_send" ]] ) ; then
|
|
- KDUMP_REQUIRED_PROGRAMS="$KDUMP_REQUIRED_PROGRAMS /usr/lib/fence_kdump_send"
|
|
+ if [ -f "$FENCE_KDUMP_SEND" ] &&
|
|
+ [[ $KDUMP_POSTSCRIPT =~ "$FENCE_KDUMP_SEND" ]] ; then
|
|
+ KDUMP_REQUIRED_PROGRAMS="$KDUMP_REQUIRED_PROGRAMS $FENCE_KDUMP_SEND"
|
|
fi
|
|
|
|
# make sure NSS works somehow
|