From 98d4be908add85fa83212543d3a822b7e0ebb8c2 Mon Sep 17 00:00:00 2001 From: Martin Perina Date: Wed, 2 Apr 2014 10:33:41 +0200 Subject: [PATCH] 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 Acked-by: Vivek Goyal --- dracut-kdump.sh | 4 ++-- dracut-module-setup.sh | 2 +- kdump-lib.sh | 2 +- kdumpctl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dracut-kdump.sh b/dracut-kdump.sh index d9e65ac..06e41bc 100755 --- a/dracut-kdump.sh +++ b/dracut-kdump.sh @@ -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 diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index bdadf7c..cd60cf1 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -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 diff --git a/kdump-lib.sh b/kdump-lib.sh index de32650..d72e16b 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -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" diff --git a/kdumpctl b/kdumpctl index 8d5498a..24fb988 100755 --- a/kdumpctl +++ b/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"