Merge pull request #7744 from rhc54/topic/sync

Pickup the OMPI system-default parameters

opal/mca/base/mca_base_var.c

@@ -414,23 +414,29 @@ static void resolve_relative_paths(char **file_prefix, char *file_path, bool rel
 
 int mca_base_var_cache_files(bool rel_path_search)
 {
-    char *tmp;
+    char *tmp = NULL;
     int ret;
 
-    if (NULL != getenv("OPAL_USER_PARAMS_GIVEN")) {
-        /* PMIx already provided the params for us */
-        return OPAL_SUCCESS;
-    }
-
 #if OPAL_WANT_HOME_CONFIG_FILES
-    opal_asprintf(&mca_base_var_files, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
+    if (NULL == getenv("OPAL_USER_PARAMS_GIVEN")) {
-             "mca-params.conf%c%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
+        opal_asprintf(&tmp, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
-             home, ',', opal_install_dirs.sysconfdir);
+                 "mca-params.conf", home);
-#else
+    }
-    opal_asprintf(&mca_base_var_files, "%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
-             opal_install_dirs.sysconfdir);
 #endif
 
+    if (NULL == getenv("OPAL_SYS_PARAMS_GIVEN")) {
+        if (NULL != tmp) {
+            opal_asprintf(&mca_base_var_files, "%s,%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
+                     tmp, opal_install_dirs.sysconfdir);
+            free(tmp);
+        } else {
+            opal_asprintf(&mca_base_var_files, "%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
+                     opal_install_dirs.sysconfdir);
+        }
+    } else {
+        mca_base_var_files = strdup("none");
+    }
+
     /* Initialize a parameter that says where MCA param files can be found.
        We may change this value so set the scope to MCA_BASE_VAR_SCOPE_READONLY */
     tmp = mca_base_var_files;

opal/mca/pmix/pmix4x/openpmix

@@ -1 +1 @@
-Subproject commit 179c0ce0fe146eef0923abf627a0b7f25624abb3
+Subproject commit ad669dfb222df0d12de18e69a8ba1dbe8f39d2cf