Rename FENCE_KDUMP_CONFIG to FENCE_KDUMP_CONFIG_FILE
Renames FENCE_KDUMP_CONFIG variable to FENCE_KDUMP_CONFIG_FILE to distinguish it from values read from fence_kdump_args option in kdump.conf (introduced in following patches). Bug-Url: https://bugzilla.redhat.com/1078134 Signed-off-by: Martin Perina <mperina@redhat.com> Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
parent
bf40f2983a
commit
98d4be908a
@ -292,8 +292,8 @@ fence_kdump_notify()
|
||||
local nodes
|
||||
|
||||
if [ -f $FENCE_KDUMP_NODES ]; then
|
||||
if [ -f $FENCE_KDUMP_CONFIG ]; then
|
||||
. $FENCE_KDUMP_CONFIG
|
||||
if [ -f $FENCE_KDUMP_CONFIG_FILE ]; then
|
||||
. $FENCE_KDUMP_CONFIG_FILE
|
||||
fi
|
||||
|
||||
read nodes < $FENCE_KDUMP_NODES
|
||||
|
@ -444,7 +444,7 @@ kdump_check_fence_kdump () {
|
||||
|
||||
echo "$nodes" > ${initdir}/$FENCE_KDUMP_NODES
|
||||
dracut_install $FENCE_KDUMP_SEND
|
||||
dracut_install -o $FENCE_KDUMP_CONFIG
|
||||
dracut_install -o $FENCE_KDUMP_CONFIG_FILE
|
||||
}
|
||||
|
||||
# Install a random seed used to feed /dev/urandom
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Kdump common variables and functions
|
||||
#
|
||||
|
||||
FENCE_KDUMP_CONFIG="/etc/sysconfig/fence_kdump"
|
||||
FENCE_KDUMP_CONFIG_FILE="/etc/sysconfig/fence_kdump"
|
||||
FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send"
|
||||
FENCE_KDUMP_NODES="/etc/fence_kdump_nodes"
|
||||
|
||||
|
4
kdumpctl
4
kdumpctl
@ -249,8 +249,8 @@ function check_rebuild()
|
||||
EXTRA_BINS="$EXTRA_BINS $CHECK_FILES"
|
||||
files="$KDUMP_CONFIG_FILE $kdump_kernel $EXTRA_BINS"
|
||||
|
||||
if [ -f $FENCE_KDUMP_CONFIG ]; then
|
||||
files="$files $FENCE_KDUMP_CONFIG"
|
||||
if [ -f $FENCE_KDUMP_CONFIG_FILE ]; then
|
||||
files="$files $FENCE_KDUMP_CONFIG_FILE"
|
||||
fi
|
||||
|
||||
check_exist "$files" && check_executable "$EXTRA_BINS"
|
||||
|
Loading…
Reference in New Issue
Block a user