Attachment 886470 Details for Bug 1083938 – [RHEL6.6 PATCH 3/4] Code cleanup in fence_kdump setup section

[patch] [RHEL6.6 PATCH 3/4] Code cleanup in fence_kdump setup section

0003-Code-cleanup-in-fence_kdump-setup-section.patch (text/plain), 1.57 KB, created by Martin Perina on 2014-04-15 12:47:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Perina

Created: 2014-04-15 12:47:33 UTC

Size: 1.57 KB

patch

obsolete

>From dda1c9306cc94e8f05a3f8209ad816b7dd272f9a Mon Sep 17 00:00:00 2001
>From: Martin Perina <mperina@redhat.com>
>Date: Tue, 15 Apr 2014 13:37:43 +0200
>Subject: [RHEL6.6 PATCH 3/4] Code cleanup in fence_kdump setup section
>
>This is part of code cleanup prior to introduction of fence_kdump
>configuration for generic clusters.
>
>Related: rhbz#1083938
>Signed-off-by: Martin Perina <mperina@redhat.com>
>---
> mkdumprd | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/mkdumprd b/mkdumprd
>index 1751baf..6ce9329 100644
>--- a/mkdumprd
>+++ b/mkdumprd
>@@ -1783,10 +1783,19 @@ if [ "$DEFAULT_ACTION" == "mount_root_run_init" ];then
>     add_rootfs
> fi
> 
>-# handle cluster node if CLUSTER_CONFIG_FILE and fence_kudmp_send exist
>+# setup fence_kdump
>+nodelist=""
> if is_pcs_fence_kdump; then
>-    # get cluster nodes from CLUSTER_CONFIG_FILE, get interface and ip addresses
>+    # fence_kdump setup for Pacemaker clusters
>     nodelist=$(get_pcs_cluster_nodes)
>+
>+    # read fence_kdump_send options and store them to FENCE_KDUMP_OPTS
>+    if [ -f "$FENCE_KDUMP_CONFIG" ]; then
>+        . "$FENCE_KDUMP_CONFIG"
>+    fi
>+fi
>+
>+if [ -n "$nodelist" ]; then
>     for node in ${nodelist}; do
> 	addr=`getent hosts $node | cut -d' ' -f1`
> 	netdev=`/sbin/ip route get to $addr 2>&1`
>@@ -1808,9 +1817,6 @@ if is_pcs_fence_kdump; then
> 	handlenetdev $netdev
> 	echo $netdev >> $MNTIMAGE/etc/iface_to_activate
>     done
>-    if [ -f "$FENCE_KDUMP_CONFIG" ]; then
>-	. "$FENCE_KDUMP_CONFIG"
>-    fi
>     if [ -n "$CLUSTER_NODE_LIST" ]; then
> 	bin="$bin /usr/sbin/fence_kdump_send"
>     fi
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1083938: 886467 | 886469 | 886470 | 886471 | 886772 | 886773 | 886774 | 886776