broker: run rc scripts directly

Problem: rc1, rc3 scripts are run with shell -c <script> but
they could be executed directly.

Run scripts directly.
Adjust one test.

Author: garlick

src/broker/broker.c

@@ -757,11 +757,11 @@ static int create_runat_phases (broker_ctx_t *ctx)
     /* rc1 - initialization
      */
     if (rc1 && strlen (rc1) > 0) {
-        if (runat_push_shell_command (ctx->runat,
-                                      "rc1",
-                                      rc1,
-                                      RUNAT_FLAG_LOG_STDIO) < 0) {
-            log_err ("runat_push_shell_command rc1");
+        if (runat_push_command_line (ctx->runat,
+                                     "rc1",
+                                     rc1,
+                                     RUNAT_FLAG_LOG_STDIO) < 0) {
+            log_err ("runat_push_command_line rc1");
             return -1;
         }
     }
@@ -780,23 +780,23 @@ static int create_runat_phases (broker_ctx_t *ctx)
     /* shutdown - clean up in preparation for instance shutdown
      */
     if (ctx->rank == 0 && shutdown && strlen (shutdown) > 0) {
-        if (runat_push_shell_command (ctx->runat,
-                                      "shutdown",
+        if (runat_push_command_line (ctx->runat,
+                                     "shutdown",
                                       shutdown,
                                       RUNAT_FLAG_LOG_STDIO) < 0) {
-            log_err ("runat_push_shell_command shutdown");
+            log_err ("runat_push_command_line shutdown");
             return -1;
         }
     }
 
     /* rc3 - finalization
      */
     if (rc3 && strlen (rc3) > 0) {
-        if (runat_push_shell_command (ctx->runat,
-                                      "rc3",
-                                      rc3,
-                                      RUNAT_FLAG_LOG_STDIO) < 0) {
-            log_err ("runat_push_shell_command rc3");
+        if (runat_push_command_line (ctx->runat,
+                                     "rc3",
+                                     rc3,
+                                     RUNAT_FLAG_LOG_STDIO) < 0) {
+            log_err ("runat_push_command_line rc3");
             return -1;
         }
     }

src/broker/runat.c

@@ -37,6 +37,7 @@
 #include "src/common/libczmqcontainers/czmq_containers.h"
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/monotime.h"
+#include "src/common/libutil/errno_safe.h"
 #include "ccan/str/str.h"
 
 #include "runat.h"
@@ -552,6 +553,29 @@ int runat_push_command (struct runat *r,
     return -1;
 }
 
+int runat_push_command_line (struct runat *r,
+                             const char *name,
+                             const char *cmdline,
+                             int flags)
+{
+    int rc;
+    char *argz = NULL;
+    size_t argz_len = 0;
+
+    if (!cmdline) {
+        errno = EINVAL;
+        return -1;
+    }
+    rc = argz_create_sep (cmdline, ' ', &argz, &argz_len);
+    if (rc != 0) {
+        errno = rc;
+        return -1;
+    }
+    rc = runat_push_command (r, name, argz, argz_len, flags);
+    ERRNO_SAFE_WRAP (free, argz);
+    return rc;
+}
+
 int runat_get_exit_code (struct runat *r, const char *name, int *rc)
 {
     struct runat_entry *entry;

src/broker/runat.h

@@ -54,6 +54,13 @@ int runat_push_command (struct runat *r,
                         size_t argz_len,
                         int flags);
 
+/* Same but with command specified by cmdline.
+ */
+int runat_push_command_line (struct runat *r,
+                             const char *name,
+                             const char *cmdline,
+                             int flags);
+
 /* Get exit code of completed command list.
  * If multiple commands fail, the exit code is that of the first failure.
  */

t/t0014-runlevel.t

@@ -28,7 +28,7 @@ test_expect_success 'rc1 failure causes instance failure' '
 test_expect_success 'rc1 bad path handled same as failure' '
 	(
 	  SHELL=/bin/sh &&
-	  test_expect_code 127 flux start \
+	  test_expect_code 1 flux start \
 		-o,-Sbroker.rc1_path=rc1-nonexist \
 		-o,-Sbroker.rc3_path= \
 		-o,-Sbroker.shutdown_path= \