Merge pull request #2 from grondo/flux-start-fixes

Fixes for flux-start
flux-framework · Sep 27, 2014 · 2688b82 · 2688b82
2 parents 108a992 + c3c507f
commit 2688b82
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/cmd/flux-start.c b/src/cmd/flux-start.c
@@ -47,7 +47,7 @@ void start_slurm (int size, int kary, const char *modules, const char *modopts,
  */
 const int child_wait_seconds = 1;
 
-#define OPTIONS "hvs:k:M:O:XN:p:S"
+#define OPTIONS "+hvs:k:M:O:XN:p:S"
 static const struct option longopts[] = {
     {"help",       no_argument,        0, 'h'},
     {"verbose",    no_argument,        0, 'v'},
@@ -300,7 +300,7 @@ void start_slurm (int size, int kary, const char *modules, const char *modopts,
     argv_push (&ac, &av, "--propagate=CORE");
     if (!cmd)
         argv_push (&ac, &av, "--pty");
-    argv_push (&ac, &av, "--jobname=%s", "flux");
+    argv_push (&ac, &av, "--job-name=%s", "flux");
     if (partition)
         argv_push (&ac, &av, "--partition=%s", partition);