* Real quick merge from the tim branch to get the last of the hostfile

changes so that I can remove the references to the hosts file in the
  trunk.

This commit was SVN r4938.

RTE_MERGE_README

@@ -1,6 +1,15 @@
 This file contains information on merging the branches/tim tree into the
 trunk.
 
+UPDATE MERGE 4:
+
+  svn merge -r4933:4937 svn+ssh://svn.open-mpi.org/l/svn/ompi/branches/tim .
+
+U  src/runtime/orte_restart.c
+U  src/mca/pls/bproc_seed/pls_bproc_seed.c
+U  etc/openmpi-default-hostfile
+
+
 UPDATE MERGE 3:
 
   svn merge -r4922:4933 svn+ssh://svn.open-mpi.org/l/svn/ompi/branches/tim .

etc/openmpi-default-hostfile

@@ -1 +1 @@
-localhost count=1
+localhost

src/mca/pls/bproc_seed/pls_bproc_seed.c

@@ -440,17 +440,18 @@ static int orte_pls_bproc_launch_app(
         orte_process_name_t* daemon_name;
         int fd;
         int rank = rc;
-        
+
         /* connect stdin to /dev/null */
-        fd = open("/dev/null", O_RDWR);
+        fd = open("/dev/null", O_RDONLY);
         if(fd >= 0) {
             if(fd != 0) {
                 dup2(fd, 0);
+                close(fd);
             }
         }
 
         /* connect stdout/stderr to a file */
-        fd = open("/tmp/orte.log", O_CREAT|O_RDWR|O_TRUNC, 0666);
+        fd = open("/tmp/orte.log", O_CREAT|O_WRONLY|O_TRUNC, 0666);
         if(fd >= 0) {
             if(fd != 1) {
                 dup2(fd,1);
@@ -458,6 +459,9 @@ static int orte_pls_bproc_launch_app(
             if(fd != 2) {
                 dup2(fd,2);
             }
+            if(fd > 2) {
+                close(fd);
+            }
         } else {
             _exit(-1); 
         }

src/runtime/orte_restart.c

@@ -101,6 +101,27 @@ int orte_restart(orte_process_name_t *name, const char* uri)
     /*
      * setup new global state
      */
+    orte_process_info.seed = false;
+
+    /* if NULL, set ns_replica to old_name and set the corresponding uri parameter */
+    if (NULL == orte_process_info.ns_replica) {
+        orte_process_info.ns_replica = old_name;
+        orte_process_info.ns_replica_uri = strdup(uri);
+    }
+    
+    /* if NULL, set gpr_replica to old_name and set the corresponding uri parameter */
+    if (NULL == orte_process_info.gpr_replica) {
+        orte_process_info.gpr_replica = old_name;
+        orte_process_info.gpr_replica_uri = strdup(uri);
+    }
+
+    /* ensure my_name is set to the new_name */
+    if (NULL != orte_process_info.my_name) {
+        free(orte_process_info.my_name);
+    }
+    orte_process_info.my_name = new_name;
+
+#if 0
     /* close the proc_info structure so it can be reinitialized */
     if (ORTE_SUCCESS != (rc = orte_proc_info_finalize())) {
         ORTE_ERROR_LOG(rc);
@@ -113,33 +134,6 @@ int orte_restart(orte_process_name_t *name, const char* uri)
         ORTE_ERROR_LOG(rc);
         return rc;
     }
-    /* if NULL, set ns_replica to old_name and set the corresponding uri parameter */
-    if (NULL == orte_process_info.ns_replica) {
-        orte_process_info.ns_replica = old_name;
-        if (NULL != orte_process_info.ns_replica_uri) {
-            free(orte_process_info.ns_replica_uri);
-            orte_process_info.ns_replica_uri = NULL;
-        }
-        id = mca_base_param_register_string("ns", "replica", "uri", NULL, NULL);
-        if (ORTE_SUCCESS != (rc = mca_base_param_set_string(id, (char*)uri))) {
-            ORTE_ERROR_LOG(rc);
-            return rc;
-        }
-    }
-    
-    /* if NULL, set gpr_replica to old_name and set the corresponding uri parameter */
-    if (NULL == orte_process_info.gpr_replica) {
-        orte_process_info.gpr_replica = old_name;
-        if (NULL != orte_process_info.gpr_replica_uri) {
-            free(orte_process_info.gpr_replica_uri);
-            orte_process_info.gpr_replica_uri = NULL;
-        }
-        id = mca_base_param_register_string("gpr", "replica", "uri", NULL, NULL);
-        if (ORTE_SUCCESS != (rc = mca_base_param_set_string(id, (char*)uri))) {
-            ORTE_ERROR_LOG(rc);
-            return rc;
-        }
-    }
 
     /* call proc_info to reset the structure */
     if (ORTE_SUCCESS != (rc = orte_proc_info())) {
@@ -147,12 +141,6 @@ int orte_restart(orte_process_name_t *name, const char* uri)
         return rc;
     }
     
-    /* ensure my_name is set to the new_name */
-    if (NULL != orte_process_info.my_name) {
-        free(orte_process_info.my_name);
-    }
-    orte_process_info.my_name = new_name;
-
     /* finalize the sys_info structure so it can be reinitialized */
     if (ORTE_SUCCESS != (rc = orte_sys_info_finalize())) {
         ORTE_ERROR_LOG(rc);
@@ -205,6 +193,7 @@ int orte_restart(orte_process_name_t *name, const char* uri)
     if (NULL != procid_str) {
         free(procid_str);
     }
+#endif
 
     /*
      * Re-open components.
@@ -245,10 +234,14 @@ int orte_restart(orte_process_name_t *name, const char* uri)
     }
 
     /*
-     * Set contact info for our parent
+     * Set contact info for the replicas
      */
 
-    if (ORTE_SUCCESS != (rc = orte_rml.set_uri(uri))) {
+    if (ORTE_SUCCESS != (rc = orte_rml.set_uri(orte_process_info.ns_replica_uri))) {
+        ORTE_ERROR_LOG(rc);
+        return rc;
+    }
+    if (ORTE_SUCCESS != (rc = orte_rml.set_uri(orte_process_info.gpr_replica_uri))) {
         ORTE_ERROR_LOG(rc);
         return rc;
     }