From b2e6c02e227f6f6a5d9ee69881bab365e7967d65 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Fri, 26 Mar 2010 16:26:35 +0000
Subject: [PATCH] Add critical mca param to cisco platform files

This commit was SVN r22895.
---
 contrib/platform/cisco/ebuild/hlfr.conf              | 3 +++
 contrib/platform/cisco/ebuild/native.conf            | 3 +++
 contrib/platform/cisco/macosx-dynamic-optimized.conf | 3 +--
 contrib/platform/cisco/macosx-dynamic.conf           | 3 +++
 contrib/platform/cisco/macosx-static.conf            | 3 +--
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/contrib/platform/cisco/ebuild/hlfr.conf b/contrib/platform/cisco/ebuild/hlfr.conf
index 2ddc9acad6..19f4ec385d 100644
--- a/contrib/platform/cisco/ebuild/hlfr.conf
+++ b/contrib/platform/cisco/ebuild/hlfr.conf
@@ -53,6 +53,9 @@ mca_component_show_load_errors = 0
 orte_abort_timeout = 10 
 opal_set_max_sys_limits = 1
 
+# ORTE behavior
+errmgr_base_enable_recovery = 1
+
 ## Add the interface for out-of-band communication
 ## and set it up
 #oob_tcp_listen_mode = listen_thread
diff --git a/contrib/platform/cisco/ebuild/native.conf b/contrib/platform/cisco/ebuild/native.conf
index 240ad493f1..da3e6e04e4 100644
--- a/contrib/platform/cisco/ebuild/native.conf
+++ b/contrib/platform/cisco/ebuild/native.conf
@@ -53,6 +53,9 @@ mca_component_show_load_errors = 0
 orte_abort_timeout = 10 
 opal_set_max_sys_limits = 1
 
+# ORTE behavior
+errmgr_base_enable_recovery = 1
+
 ## Add the interface for out-of-band communication
 ## and set it up
 #oob_tcp_listen_mode = listen_thread
diff --git a/contrib/platform/cisco/macosx-dynamic-optimized.conf b/contrib/platform/cisco/macosx-dynamic-optimized.conf
index ce8ff6ea4e..e5369fc287 100644
--- a/contrib/platform/cisco/macosx-dynamic-optimized.conf
+++ b/contrib/platform/cisco/macosx-dynamic-optimized.conf
@@ -63,8 +63,7 @@ mca_component_show_load_errors = 0
 orte_abort_timeout = 10 
 
 # ORTE behavior
-rmaps = resilient
-plm = rsh
+errmgr_base_enable_recovery = 1
 
 ## Add the interface for out-of-band communication
 ## and set it up
diff --git a/contrib/platform/cisco/macosx-dynamic.conf b/contrib/platform/cisco/macosx-dynamic.conf
index 3e88cce2e4..b7e6ec8029 100644
--- a/contrib/platform/cisco/macosx-dynamic.conf
+++ b/contrib/platform/cisco/macosx-dynamic.conf
@@ -62,6 +62,9 @@
 mca_component_show_load_errors = 0
 orte_abort_timeout = 10 
 
+# ORTE behavior
+errmgr_base_enable_recovery = 1
+
 ## Add the interface for out-of-band communication
 ## and set it up
 #oob_tcp_listen_mode = listen_thread
diff --git a/contrib/platform/cisco/macosx-static.conf b/contrib/platform/cisco/macosx-static.conf
index 27b339d842..b7e6ec8029 100644
--- a/contrib/platform/cisco/macosx-static.conf
+++ b/contrib/platform/cisco/macosx-static.conf
@@ -63,8 +63,7 @@ mca_component_show_load_errors = 0
 orte_abort_timeout = 10 
 
 # ORTE behavior
-rmaps = resilient
-plm = rsh
+errmgr_base_enable_recovery = 1
 
 ## Add the interface for out-of-band communication
 ## and set it up