rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename is_fence_kdump to is_pcs_fence_kdump

Browse Source 
Renames is_fence_kdump to is_pcs_fence_kdump to identify that this
method should be used to detect fence_kdump configuration only in
Pacemaker clusters.

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:
Martin Perina 2014-04-02 10:33:43 +02:00 committed by WANG Chao
parent 48f4375f2e
commit 98f58cdc56
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dracut-module-setup.sh
View File

@ -20,7 +20,7 @@ depends() {
_dep="$_dep drm" _dep="$_dep drm"
fi fi
if is_fence_kdump; then if is_pcs_fence_kdump; then
_dep="$_dep network" _dep="$_dep network"
fi fi
@ -421,7 +421,7 @@ kdump_check_iscsi_targets () {
# also preserve '[node list]' for 2nd kernel /etc/fence_kdump_nodes # also preserve '[node list]' for 2nd kernel /etc/fence_kdump_nodes
kdump_check_fence_kdump () { kdump_check_fence_kdump () {
local nodes local nodes
is_fence_kdump || return 1 is_pcs_fence_kdump || return 1
# get cluster nodes from cluster cib, get interface and ip address # get cluster nodes from cluster cib, get interface and ip address
nodelist=`pcs cluster cib | xmllint --xpath "/cib/status/node_state/@uname" -` nodelist=`pcs cluster cib | xmllint --xpath "/cib/status/node_state/@uname" -`

4
kdump-lib.sh
View File

@ -27,8 +27,8 @@ strip_comments()
echo $@ | sed -e 's/\(.*\)#.*/\1/' echo $@ | sed -e 's/\(.*\)#.*/\1/'
} }
# Check if fence kdump is configured in cluster # Check if fence kdump is configured in Pacemaker cluster
is_fence_kdump() is_pcs_fence_kdump()
{ {
# no pcs or fence_kdump_send executables installed? # no pcs or fence_kdump_send executables installed?
type -P pcs > /dev/null || return 1 type -P pcs > /dev/null || return 1

2
kdumpctl
View File

@ -192,7 +192,7 @@ function check_fence_kdump()
local image_time=$1 local image_time=$1
local cib_time 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)' - | \ cib_time=`pcs cluster cib | xmllint --xpath 'string(/cib/@cib-last-written)' - | \
xargs -0 date +%s --date` xargs -0 date +%s --date`