[PATCH 4/6] fence_kdump for generic clusters v3: Rename is_fence_kdump to is_pcs_fence_kdump

Bug-Url: https://bugzilla.redhat.com/1079821 Signed-off-by: Martin Perina <mperina(a)redhat.com&gt; --- dracut-module-setup.sh | 4 ++-- kdump-lib.sh | 4 ++-- kdumpctl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index 4aef4f8..7951121 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -20,7 +20,7 @@ depends() { _dep="$_dep drm" fi - if is_fence_kdump; then + if is_pcs_fence_kdump; then _dep="$_dep network" fi @@ -434,7 +434,7 @@ get_list_of_nodes_to_notify() { # also preserve '[node list]' for 2nd kernel /etc/fence_kdump_nodes kdump_check_fence_kdump () { local nodes - is_fence_kdump || return 1 + is_pcs_fence_kdump || return 1 # get cluster nodes from cluster cib, get interface and ip address nodelist=`pcs cluster cib | xmllint --xpath "/cib/status/node_state/@uname" -` diff --git a/kdump-lib.sh b/kdump-lib.sh index 8b72823..6f8b991 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -27,8 +27,8 @@ strip_comments() echo $@ | sed -e 's/\(.*\)#.*/\1/' } -# Check if fence kdump is configured in cluster -is_fence_kdump() +# Check if fence kdump is configured in Pacemaker cluster +is_pcs_fence_kdump() { # no pcs or fence_kdump_send executables installed? type -P pcs > /dev/null || return 1 diff --git a/kdumpctl b/kdumpctl index 24fb988..eb6bdbc 100755 --- a/kdumpctl +++ b/kdumpctl @@ -192,7 +192,7 @@ function check_fence_kdump() local image_time=$1 local cib_time - is_fence_kdump || return 1 + is_pcs_fence_kdump || return 1 cib_time=`pcs cluster cib | xmllint --xpath 'string(/cib/@cib-last-written)' - | \ xargs -0 date +%s --date` -- 1.8.3.1