Attachment 876253 Details for Bug 1078134 – Patch 2/5

[patch] Patch 2/5

0002-Rename-is_fence_kdump-to-is_pcs_fence_kdump.patch (text/plain), 2.07 KB, created by Martin Perina on 2014-03-19 09:02:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Perina

Created: 2014-03-19 09:02:05 UTC

Size: 2.07 KB

patch

obsolete

>From d27d85c2b0cd134b3d66c4efb2d779ea50743ddf Mon Sep 17 00:00:00 2001
>From: Martin Perina <mperina@redhat.com>
>Date: Fri, 14 Mar 2014 08:53:19 +0100
>Subject: [PATCH 2/5] Rename is_fence_kdump to is_pcs_fence_kdump
>
>Rename is_fence_kdump to is_pcs_fence_kdump in order to introduce
>generic cluster fence_kdump configuration in following patches.
>
>Bug-Url: https://bugzilla.redhat.com/1078134
>Signed-off-by: Martin Perina <mperina@redhat.com>
>---
> 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 2777c75..95a11f3 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
> 
>@@ -421,7 +421,7 @@ kdump_check_iscsi_targets () {
> # also preserve '[node list]' for 2nd kernel in $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 19389a6..96a6c12 100755
>--- a/kdump-lib.sh
>+++ b/kdump-lib.sh
>@@ -28,8 +28,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 8d5498a..f374abf 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
>

Actions: View | Diff

Attachments on bug 1078134: 876252 | 876253 | 876254 | 876255 | 876256 | 879449 | 879461 | 879464 | 879465 | 879466 | 879467 | 879468 | 881288 | 881289 | 881290 | 881291 | 881292 | 881293 | 882135 | 882136 | 882137 | 882138 | 882140 | 882141 | 882142