]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/dird/ua_run.c
This commit was manufactured by cvs2svn to create tag
[bacula/bacula] / bacula / src / dird / ua_run.c
index fac2652a4caa6523798ffa59fd7a443662a4402d..be20b7dbc3cf610a59dbcb37104b68423888093b 100644 (file)
@@ -8,7 +8,7 @@
  */
 
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
 
 #include "bacula.h"
 #include "dird.h"
-#include "ua.h"
 
 /* Imported subroutines */
-extern void run_job(JCR *jcr);
 
 /* Imported variables */
 extern struct s_jl joblevels[];
+extern struct s_kw ReplaceOptions[];
 
 /*
  * For Backup and Verify Jobs
@@ -45,27 +44,42 @@ extern struct s_jl joblevels[];
  *     run <job-name> jobid=nn
  *
  */
-int runcmd(UAContext *ua, char *cmd)
+int run_cmd(UAContext *ua, char *cmd)
 {
    JCR *jcr;
-   char *job_name, *level_name, *jid, *store_name;
-   char *where, *fileset_name, *client_name, *bootstrap;
-   int i, j, found;
+   char *job_name, *level_name, *jid, *store_name, *pool_name;
+   char *where, *fileset_name, *client_name, *bootstrap, *replace;
+   char *when, *verify_job_name;
+   int Priority = 0;
+   int i, j, opt;
+   bool found;
    JOB *job = NULL;
+   JOB *verify_job = NULL;
    STORE *store = NULL;
    CLIENT *client = NULL;
    FILESET *fileset = NULL;
-   static char *kw[] = {
+   POOL *pool = NULL;
+   static char *kw[] = {             /* command line arguments */
       N_("job"),
       N_("jobid"),
       N_("client"),
       N_("fileset"),
       N_("level"),
       N_("storage"),
+      N_("pool"), 
       N_("where"),
       N_("bootstrap"),
+      N_("replace"),
+      N_("when"),
+      N_("priority"),
+      N_("yes"),          /* 12 -- if you change this change YES_POS too */
+      N_("run"),          /* 13 -- if you change this change RUN_POS too */
+      N_("verifyjob"),
       NULL};
 
+#define YES_POS 12
+#define RUN_POS 13
+
    if (!open_db(ua)) {
       return 1;
    }
@@ -74,90 +88,141 @@ int runcmd(UAContext *ua, char *cmd)
    level_name = NULL;
    jid = NULL;
    store_name = NULL;
+   pool_name = NULL;
    where = NULL;
+   when = NULL;
    client_name = NULL;
    fileset_name = NULL;
    bootstrap = NULL;
-
-   Dmsg1(000, "run: %s\n", ua->UA_sock->msg);
+   replace = NULL;
+   verify_job_name = NULL;
 
    for (i=1; i<ua->argc; i++) {
-      found = False;
+      found = false;
       Dmsg2(200, "Doing arg %d = %s\n", i, ua->argk[i]);
       for (j=0; !found && kw[j]; j++) {
         if (strcasecmp(ua->argk[i], _(kw[j])) == 0) {
-           if (!ua->argv[i]) {
+           /* Note, yes and run have no value, so do not err */
+           if (!ua->argv[i] && (j != YES_POS /*yes*/ && j != RUN_POS)) {  
                bsendmsg(ua, _("Value missing for keyword %s\n"), ua->argk[i]);
               return 1;
            }
             Dmsg1(200, "Got keyword=%s\n", kw[j]);
            switch (j) {
-              case 0: /* job */
-                 if (job_name) {
-                     bsendmsg(ua, _("Job name specified twice.\n"));
-                    return 1;
-                 }
-                 job_name = ua->argv[i];
-                 found = True;
-                 break;
-              case 1: /* JobId */
-                 if (jid) {
-                     bsendmsg(ua, _("JobId specified twice.\n"));
-                    return 1;
-                 }
-                 jid = ua->argv[i];
-                 found = True;
-                 break;
-              case 2: /* client */
-                 if (client_name) {
-                     bsendmsg(ua, _("Client specified twice.\n"));
-                    return 1;
-                 }
-                 client_name = ua->argv[i];
-                 found = True;
-                 break;
-              case 3: /* fileset */
-                 if (fileset_name) {
-                     bsendmsg(ua, _("FileSet specified twice.\n"));
-                    return 1;
-                 }
-                 fileset_name = ua->argv[i];
-                 found = True;
-                 break;
-              case 4: /* level */
-                 if (level_name) {
-                     bsendmsg(ua, _("Level specified twice.\n"));
-                    return 1;
-                 }
-                 level_name = ua->argv[i];
-                 found = True;
-                 break;
-              case 5: /* storage */
-                 if (store_name) {
-                     bsendmsg(ua, _("Storage specified twice.\n"));
-                    return 1;
-                 }
-                 store_name = ua->argv[i];
-                 found = True;
-                 break;
-              case 6: /* where */
-                 if (where) {
-                     bsendmsg(ua, _("Where specified twice.\n"));
-                    return 1;
-                 }
-                 where = ua->argv[i];
-                 found = True;
-                 break;
-              case 7: /* bootstrap */
-                 if (bootstrap) {
-                     bsendmsg(ua, _("Bootstrap specified twice.\n"));
-                    return 1;
-                 }
-                 bootstrap = ua->argv[i];
-                 found = True;
-                 break;
-              default:
-                 break;
+           case 0: /* job */
+              if (job_name) {
+                  bsendmsg(ua, _("Job name specified twice.\n"));
+                 return 1;
+              }
+              job_name = ua->argv[i];
+              found = true;
+              break;
+           case 1: /* JobId */
+              if (jid) {
+                  bsendmsg(ua, _("JobId specified twice.\n"));
+                 return 1;
+              }
+              jid = ua->argv[i];
+              found = true;
+              break;
+           case 2: /* client */
+              if (client_name) {
+                  bsendmsg(ua, _("Client specified twice.\n"));
+                 return 1;
+              }
+              client_name = ua->argv[i];
+              found = true;
+              break;
+           case 3: /* fileset */
+              if (fileset_name) {
+                  bsendmsg(ua, _("FileSet specified twice.\n"));
+                 return 1;
+              }
+              fileset_name = ua->argv[i];
+              found = true;
+              break;
+           case 4: /* level */
+              if (level_name) {
+                  bsendmsg(ua, _("Level specified twice.\n"));
+                 return 1;
+              }
+              level_name = ua->argv[i];
+              found = true;
+              break;
+           case 5: /* storage */
+              if (store_name) {
+                  bsendmsg(ua, _("Storage specified twice.\n"));
+                 return 1;
+              }
+              store_name = ua->argv[i];
+              found = true;
+              break;
+           case 6: /* pool */
+              if (pool_name) {
+                  bsendmsg(ua, _("Pool specified twice.\n"));
+                 return 1;
+              }
+              pool_name = ua->argv[i];
+              found = true;
+              break;
+           case 7: /* where */
+              if (where) {
+                  bsendmsg(ua, _("Where specified twice.\n"));
+                 return 1;
+              }
+              where = ua->argv[i];
+              found = true;
+              break;
+           case 8: /* bootstrap */
+              if (bootstrap) {
+                  bsendmsg(ua, _("Bootstrap specified twice.\n"));
+                 return 1;
+              }
+              bootstrap = ua->argv[i];
+              found = true;
+              break;
+           case 9: /* replace */
+              if (replace) {
+                  bsendmsg(ua, _("Replace specified twice.\n"));
+                 return 1;
+              }
+              replace = ua->argv[i];
+              found = true;
+              break;
+           case 10: /* When */
+              if (when) {
+                  bsendmsg(ua, _("When specified twice.\n"));
+                 return 1;
+              }
+              when = ua->argv[i];
+              found = true;
+              break;
+           case 11:  /* Priority */
+              if (Priority) {
+                  bsendmsg(ua, _("Priority specified twice.\n"));
+                 return 1;
+              }
+              Priority = atoi(ua->argv[i]);
+              if (Priority <= 0) {
+                  bsendmsg(ua, _("Priority must be positive nonzero setting it to 10.\n"));
+                 Priority = 10;
+              }
+              break;
+           case 12: /* yes */
+           case 13: /* run */
+              found = true;
+              break;
+           case 14: /* Verify Job */
+              if (verify_job_name) {
+                  bsendmsg(ua, _("Verify Job specified twice.\n"));
+                 return 1;
+              }
+              verify_job_name = ua->argv[i];
+              found = true;
+              break;
+
+           default:
+              break;
            }
         } /* end strcase compare */
       } /* end keyword loop */
@@ -185,7 +250,7 @@ int runcmd(UAContext *ua, char *cmd)
       /* Find Job */
       job = (JOB *)GetResWithName(R_JOB, job_name);
       if (!job) {
-         bsendmsg(ua, _("Job %s: not found\n"), job_name);
+         bsendmsg(ua, _("Job \"%s\" not found\n"), job_name);
         job = select_job_resource(ua);
       } else {
          Dmsg1(200, "Found job=%s\n", job_name);
@@ -201,7 +266,7 @@ int runcmd(UAContext *ua, char *cmd)
    if (store_name) {
       store = (STORE *)GetResWithName(R_STORAGE, store_name);
       if (!store) {
-         bsendmsg(ua, _("Storage %s not found.\n"), store_name);
+         bsendmsg(ua, _("Storage \"%s\" not found.\n"), store_name);
         store = select_storage_resource(ua);
       }
    } else {
@@ -211,10 +276,24 @@ int runcmd(UAContext *ua, char *cmd)
       return 1;
    }
 
+
+   if (pool_name) {
+      pool = (POOL *)GetResWithName(R_POOL, pool_name);
+      if (!pool) {
+         bsendmsg(ua, _("Pool \"%s\" not found.\n"), pool_name);
+        pool = get_pool_resource(ua);
+      }
+   } else {
+      pool = job->pool;            /* use default */
+   }
+   if (!pool) {
+      return 1;
+   }
+
    if (client_name) {
       client = (CLIENT *)GetResWithName(R_CLIENT, client_name);
       if (!client) {
-         bsendmsg(ua, _("Client %s not found.\n"), client_name);
+         bsendmsg(ua, _("Client \"%s\" not found.\n"), client_name);
         client = select_client_resource(ua);
       }
    } else {
@@ -227,7 +306,7 @@ int runcmd(UAContext *ua, char *cmd)
    if (fileset_name) {
       fileset = (FILESET *)GetResWithName(R_FILESET, fileset_name);
       if (!fileset) {
-         bsendmsg(ua, _("FileSet %s not found.\n"), fileset_name);
+         bsendmsg(ua, _("FileSet \"%s\" not found.\n"), fileset_name);
         fileset = select_fileset_resource(ua);
       }
    } else {
@@ -237,21 +316,39 @@ int runcmd(UAContext *ua, char *cmd)
       return 1;
    }
 
+   if (verify_job_name) {
+      verify_job = (JOB *)GetResWithName(R_JOB, verify_job_name);
+      if (!verify_job) {
+         bsendmsg(ua, _("Verify Job \"%s\" not found.\n"), verify_job_name);
+        verify_job = select_job_resource(ua);
+      }
+   } else {
+      verify_job = job->verify_job;
+   }
 
    /* Create JCR to run job */
    jcr = new_jcr(sizeof(JCR), dird_free_jcr);
    set_jcr_defaults(jcr, job);
-   init_msg(jcr, jcr->msgs);         /* start message handler */
 
    jcr->store = store;
    jcr->client = client;
    jcr->fileset = fileset;
+   jcr->pool = pool;
    if (where) {
-      if (jcr->RestoreWhere) {
-        free(jcr->RestoreWhere);
+      if (jcr->where) {
+        free(jcr->where);
       }
-      jcr->RestoreWhere = bstrdup(where);
+      jcr->where = bstrdup(where);
    }
+
+   if (when) {
+      jcr->sched_time = str_to_utime(when);
+      if (jcr->sched_time == 0) {
+         bsendmsg(ua, _("Invalid time, using current time.\n"));
+        jcr->sched_time = time(NULL);
+      }
+   }
+        
    if (bootstrap) {
       if (jcr->RestoreBootstrap) {
         free(jcr->RestoreBootstrap);
@@ -259,25 +356,54 @@ int runcmd(UAContext *ua, char *cmd)
       jcr->RestoreBootstrap = bstrdup(bootstrap);
    }
 
+   if (replace) {
+      jcr->replace = 0;
+      for (i=0; ReplaceOptions[i].name; i++) {
+        if (strcasecmp(replace, ReplaceOptions[i].name) == 0) {
+           jcr->replace = ReplaceOptions[i].token;
+        }
+      }
+      if (!jcr->replace) {
+         bsendmsg(ua, _("Invalid replace option: %s\n"), replace);
+        return 0;
+      }
+   } else if (job->replace) {
+      jcr->replace = job->replace;
+   } else {
+      jcr->replace = REPLACE_ALWAYS;
+   }
 
-
+   if (Priority) {
+      jcr->JobPriority = Priority;
+   }
 
 try_again:
+   replace = ReplaceOptions[0].name;
+   for (i=0; ReplaceOptions[i].name; i++) {
+      if (ReplaceOptions[i].token == jcr->replace) {
+        replace = ReplaceOptions[i].name;
+      }
+   }
    Dmsg1(20, "JobType=%c\n", jcr->JobType);
    switch (jcr->JobType) {
       char ec1[30];
+      char dt[MAX_TIME_LENGTH];
       case JT_ADMIN:
          bsendmsg(ua, _("Run %s job\n\
 JobName:  %s\n\
 FileSet:  %s\n\
 Client:   %s\n\
-Storage:  %s\n"),
+Storage:  %s\n\
+When:     %s\n\
+Priority: %d\n"),
                  _("Admin"),
                 job->hdr.name,
                 jcr->fileset->hdr.name,
                 NPRT(jcr->client->hdr.name),
-                NPRT(jcr->store->hdr.name));
-        break;
+                NPRT(jcr->store->hdr.name), 
+                bstrutime(dt, sizeof(dt), jcr->sched_time), 
+                jcr->JobPriority);
+        jcr->JobLevel = L_FULL;
         break;
       case JT_BACKUP:
       case JT_VERIFY:
@@ -298,54 +424,126 @@ Storage:  %s\n"),
            }
         }
         level_name = NULL;
+        if (jcr->JobType == JT_BACKUP) {
+            bsendmsg(ua, _("Run %s job\n\
+JobName:  %s\n\
+FileSet:  %s\n\
+Level:    %s\n\
+Client:   %s\n\
+Storage:  %s\n\
+Pool:     %s\n\
+When:     %s\n\
+Priority: %d\n"),
+                 _("Backup"),
+                job->hdr.name,
+                jcr->fileset->hdr.name,
+                level_to_str(jcr->JobLevel),
+                jcr->client->hdr.name,
+                jcr->store->hdr.name,
+                NPRT(jcr->pool->hdr.name), 
+                bstrutime(dt, sizeof(dt), jcr->sched_time),
+                jcr->JobPriority);
+        } else {  /* JT_VERIFY */
+           char *Name;
+           if (jcr->job->verify_job) {
+              Name = jcr->job->verify_job->hdr.name;
+           } else {
+               Name = "";
+           }
          bsendmsg(ua, _("Run %s job\n\
 JobName:  %s\n\
 FileSet:  %s\n\
 Level:    %s\n\
 Client:   %s\n\
-Storage:  %s\n"),
-                 jcr->JobType==JT_BACKUP?_("Backup"):_("Verify"),
+Storage:  %s\n\
+Pool:     %s\n\
+Verify Job:  %s\n\
+When:     %s\n\
+Priority: %d\n"),
+                 _("Verify"),
                 job->hdr.name,
                 jcr->fileset->hdr.name,
                 level_to_str(jcr->JobLevel),
                 jcr->client->hdr.name,
-                jcr->store->hdr.name);
+                jcr->store->hdr.name,
+                NPRT(jcr->pool->hdr.name), 
+                Name,            
+                bstrutime(dt, sizeof(dt), jcr->sched_time),
+                jcr->JobPriority);
+        }
         break;
       case JT_RESTORE:
         if (jcr->RestoreJobId == 0 && !jcr->RestoreBootstrap) {
            if (jid) {
               jcr->RestoreJobId = atoi(jid);
            } else {
-               if (!get_cmd(ua, _("Please enter a JobId for restore: "))) {
+               if (!get_pint(ua, _("Please enter a JobId for restore: "))) {
                  free_jcr(jcr);
                  return 1;
               }  
-              jcr->RestoreJobId = atoi(ua->cmd);
+              jcr->RestoreJobId = ua->pint32_val;
            }
         }
-         jcr->JobLevel = 'F';         /* default level */
+        jcr->JobLevel = L_FULL;      /* default level */
          Dmsg1(20, "JobId to restore=%d\n", jcr->RestoreJobId);
-         bsendmsg(ua, _("Run Restore job\n\
+        if (jcr->RestoreJobId == 0) {
+            bsendmsg(ua, _("Run Restore job\n\
 JobName:    %s\n\
 Bootstrap:  %s\n\
 Where:      %s\n\
+Replace:    %s\n\
 FileSet:    %s\n\
 Client:     %s\n\
 Storage:    %s\n\
-JobId:      %s\n"),
+When:       %s\n\
+Priority:   %d\n"),
                 job->hdr.name,
                 NPRT(jcr->RestoreBootstrap),
-                jcr->RestoreWhere?jcr->RestoreWhere:NPRT(job->RestoreWhere),
+                jcr->where?jcr->where:NPRT(job->RestoreWhere),
+                replace,
                 jcr->fileset->hdr.name,
                 jcr->client->hdr.name,
                 jcr->store->hdr.name, 
-                 jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1));
+                bstrutime(dt, sizeof(dt), jcr->sched_time),
+                jcr->JobPriority);
+        } else {
+            bsendmsg(ua, _("Run Restore job\n\
+JobName:    %s\n\
+Bootstrap:  %s\n\
+Where:      %s\n\
+Replace:    %s\n\
+FileSet:    %s\n\
+Client:     %s\n\
+Storage:    %s\n\
+JobId:      %s\n\
+When:       %s\n\
+Priority:   %d\n"),
+                job->hdr.name,
+                NPRT(jcr->RestoreBootstrap),
+                jcr->where?jcr->where:NPRT(job->RestoreWhere),
+                replace,
+                jcr->fileset->hdr.name,
+                jcr->client->hdr.name,
+                jcr->store->hdr.name, 
+                 jcr->RestoreJobId==0?"*None*":edit_uint64(jcr->RestoreJobId, ec1), 
+                bstrutime(dt, sizeof(dt), jcr->sched_time),
+                jcr->JobPriority);
+        }
         break;
       default:
          bsendmsg(ua, _("Unknown Job Type=%d\n"), jcr->JobType);
         free_jcr(jcr);
         return 0;
    }
+
+   /* Run without prompting? */
+   if (find_arg(ua, _("yes")) > 0) {
+      Dmsg1(200, "Calling run_job job=%x\n", jcr->job);
+      run_job(jcr);
+      bsendmsg(ua, _("Run command submitted.\n"));
+      return 1;
+   }
+
    if (!get_cmd(ua, _("OK to run? (yes/mod/no): "))) {
       free_jcr(jcr);
       return 0;                      /* do not run */
@@ -353,7 +551,12 @@ JobId:      %s\n"),
    /*
     * At user request modify parameters of job to be run.
     */
-   if (strcasecmp(ua->cmd, _("mod")) == 0) {
+   if (ua->cmd[0] == 0) {
+      bsendmsg(ua, _("Job not run.\n"));
+      free_jcr(jcr);
+      return 0;                      /* do not run */
+   }
+   if (strncasecmp(ua->cmd, _("mod"), strlen(ua->cmd)) == 0) {
       FILE *fd;
 
       start_prompt(ua, _("Parameters to modify:\n"));
@@ -362,33 +565,42 @@ JobId:      %s\n"),
       add_prompt(ua, _("Job"));              /* 2 */
       add_prompt(ua, _("FileSet"));          /* 3 */
       add_prompt(ua, _("Client"));           /* 4 */
-      if (jcr->JobType == JT_RESTORE) {
-         add_prompt(ua, _("Bootstrap"));     /* 5 */
-         add_prompt(ua, _("Where"));         /* 6 */
-         add_prompt(ua, _("JobId"));         /* 7 */
+      add_prompt(ua, _("When"));             /* 5 */
+      add_prompt(ua, _("Priority"));         /* 6 */
+      if (jcr->JobType == JT_BACKUP ||
+         jcr->JobType == JT_VERIFY) {
+         add_prompt(ua, _("Pool"));          /* 7 */
+        if (jcr->JobType == JT_VERIFY) {
+            add_prompt(ua, _("Verify Job"));  /* 8 */
+        }
+      } else if (jcr->JobType == JT_RESTORE) {
+         add_prompt(ua, _("Bootstrap"));     /* 7 */
+         add_prompt(ua, _("Where"));         /* 8 */
+         add_prompt(ua, _("Replace"));       /* 9 */
+         add_prompt(ua, _("JobId"));         /* 10 */
       }
-      switch (do_prompt(ua, _("Select parameter to modify"), NULL)) {
+      switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
       case 0:
         /* Level */
         if (jcr->JobType == JT_BACKUP) {
             start_prompt(ua, _("Levels:\n"));
+            add_prompt(ua, _("Base"));
             add_prompt(ua, _("Full"));
             add_prompt(ua, _("Incremental"));
             add_prompt(ua, _("Differential"));
-            add_prompt(ua, _("Level"));
             add_prompt(ua, _("Since"));
-            switch (do_prompt(ua, _("Select level"), NULL)) {
+            switch (do_prompt(ua, "", _("Select level"), NULL, 0)) {
            case 0:
-              jcr->JobLevel = L_FULL;
+              jcr->JobLevel = L_BASE;
               break;
            case 1:
-              jcr->JobLevel = L_INCREMENTAL;
+              jcr->JobLevel = L_FULL;
               break;
            case 2:
-              jcr->JobLevel = L_DIFFERENTIAL;
+              jcr->JobLevel = L_INCREMENTAL;
               break;
            case 3:
-              jcr->JobLevel = L_LEVEL;
+              jcr->JobLevel = L_DIFFERENTIAL;
               break;
            case 4:
               jcr->JobLevel = L_SINCE;
@@ -401,9 +613,10 @@ JobId:      %s\n"),
             start_prompt(ua, _("Levels:\n"));
             add_prompt(ua, _("Initialize Catalog"));
             add_prompt(ua, _("Verify Catalog"));
-            add_prompt(ua, _("Verify Volume"));
-            add_prompt(ua, _("Verify Volume Data"));
-            switch (do_prompt(ua, _("Select level"), NULL)) {
+            add_prompt(ua, _("Verify Volume to Catalog"));
+            add_prompt(ua, _("Verify Disk to Catalog"));
+            add_prompt(ua, _("Verify Volume Data (not yet implemented)"));
+            switch (do_prompt(ua, "",  _("Select level"), NULL, 0)) {
            case 0:
               jcr->JobLevel = L_VERIFY_INIT;
               break;
@@ -414,6 +627,9 @@ JobId:      %s\n"),
               jcr->JobLevel = L_VERIFY_VOLUME_TO_CATALOG;
               break;
            case 3:
+              jcr->JobLevel = L_VERIFY_DISK_TO_CATALOG;
+              break;
+           case 4:
               jcr->JobLevel = L_VERIFY_DATA;
               break;
            default:
@@ -425,6 +641,7 @@ JobId:      %s\n"),
         }
         goto try_again;
       case 1:
+        /* Storage */
         store = select_storage_resource(ua);
         if (store) {
            jcr->store = store;
@@ -449,6 +666,7 @@ JobId:      %s\n"),
         }      
         break;
       case 4:
+        /* Client */
         client = select_client_resource(ua);
         if (client) {
            jcr->client = client;
@@ -456,6 +674,43 @@ JobId:      %s\n"),
         }
         break;
       case 5:
+        /* When */
+         if (!get_cmd(ua, _("Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now): "))) {
+           break;
+        }
+        if (ua->cmd[0] == 0) {
+           jcr->sched_time = time(NULL);
+        } else {
+           jcr->sched_time = str_to_utime(ua->cmd);
+           if (jcr->sched_time == 0) {
+               bsendmsg(ua, _("Invalid time, using current time.\n"));
+              jcr->sched_time = time(NULL);
+           }
+        }
+        goto try_again;
+      case 6:
+        /* Priority */
+         if (!get_pint(ua, _("Enter new Priority: "))) {
+           break;
+        }
+        if (ua->pint32_val == 0) {
+            bsendmsg(ua, _("Priority must be a positive integer.\n"));
+        } else {
+           jcr->JobPriority = ua->pint32_val;
+        }
+        goto try_again;
+      case 7:
+        /* Pool or Bootstrap depending on JobType */
+        if (jcr->JobType == JT_BACKUP ||
+            jcr->JobType == JT_VERIFY) {      /* Pool */
+           pool = select_pool_resource(ua);
+           if (pool) {
+              jcr->pool = pool;
+              goto try_again;
+           }
+           break;
+        }
+
         /* Bootstrap */
          if (!get_cmd(ua, _("Please enter the Bootstrap file name: "))) {
            break;
@@ -477,22 +732,42 @@ JobId:      %s\n"),
            }
         }
         goto try_again;
-      case 6:
+      case 8:
+        /* Verify Job */
+        if (jcr->JobType == JT_VERIFY) {
+           JOB *job = select_job_resource(ua);
+           if (job) {
+              jcr->job->verify_job = job;
+           } else {
+              jcr->job->verify_job = NULL;
+           }
+           goto try_again;
+        }
         /* Where */
-         if (!get_cmd(ua, _("Please enter path prefix (where) for restore: "))) {
+         if (!get_cmd(ua, _("Please enter path prefix for restore (/ for none): "))) {
            break;
         }
-        /* ***FIXME*** allow drive:/ for Windows */
-         if (ua->cmd[0] != '/') {
-            bsendmsg(ua, _("Prefix must begin with a /\n"));
-        } else {
-           if (jcr->RestoreWhere) {
-              free(jcr->RestoreWhere);
-           }
-           jcr->RestoreWhere = bstrdup(ua->cmd);
-        }  
+        if (jcr->where) {
+           free(jcr->where);
+           jcr->where = NULL;
+        }
+         if (ua->cmd[0] == '/' && ua->cmd[1] == 0) {
+           ua->cmd[0] = 0;
+        }
+        jcr->where = bstrdup(ua->cmd);
         goto try_again;
-      case 7:
+      case 9:
+        /* Replace */
+         start_prompt(ua, _("Replace:\n"));
+        for (i=0; ReplaceOptions[i].name; i++) {
+           add_prompt(ua, ReplaceOptions[i].name);
+        }
+         opt = do_prompt(ua, "", _("Select replace option"), NULL, 0);
+        if (opt >=  0) {
+           jcr->replace = ReplaceOptions[opt].token;
+        }
+        goto try_again;
+      case 10:
         /* JobId */
         jid = NULL;                  /* force reprompt */
         jcr->RestoreJobId = 0;
@@ -507,13 +782,16 @@ JobId:      %s\n"),
       free_jcr(jcr);
       return 0;                      /* error do no run Job */
    }
-   if (strcasecmp(ua->cmd, _("yes")) != 0) {
-      bsendmsg(ua, _("Job not run.\n"));
-      free_jcr(jcr);
-      return 0;                      /* do not run */
+
+   if (strncasecmp(ua->cmd, _("yes"), strlen(ua->cmd)) == 0) {
+      Dmsg1(200, "Calling run_job job=%x\n", jcr->job);
+      run_job(jcr);
+      bsendmsg(ua, _("Run command submitted.\n"));
+      return 1;
    }
 
-   Dmsg1(200, "Calling run_job job=%x\n", jcr->job);
-   run_job(jcr);
-   return 1;
+   bsendmsg(ua, _("Job not run.\n"));
+   free_jcr(jcr);
+   return 0;                      /* do not run */
+
 }