Document bare metal recovery

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@244 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/sql_cmds.c b/bacula/src/dird/sql_cmds.c
index 7dd223fd8796c834e5263c46daa61acbe67e25cc..8b439148d3f347032adba202c76ba23525d906c5 100644 (file)
--- a/bacula/src/dird/sql_cmds.c
+++ b/bacula/src/dird/sql_cmds.c
@@ -69,7 +69,8 @@ char *create_deltabs[] = {
 char *insert_delcand = 
    "INSERT INTO DelCandidates "
    "SELECT JobId, PurgedFiles, FileSetId FROM Job "
-   "WHERE JobTDate < %s " 
+   "WHERE JobType='%c' "
+   "AND JobTDate<%s " 
    "AND ClientId=%u";
 
 /* Select files from the DelCandidates table that have a
@@ -79,7 +80,7 @@ char *insert_delcand =
 char *select_backup_del =
    "SELECT DelCandidates.JobId "
    "FROM Job,DelCandidates "
-   "WHERE Job.JobTDate >= %s "
+   "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "
    "AND Job.JobType='B' "
    "AND Job.Level='F' "
@@ -93,7 +94,7 @@ char *select_backup_del =
 char *select_verify_del =
    "SELECT DelCandidates.JobId "
    "FROM Job,DelCandidates "
-   "WHERE Job.JobTDate >= %s "
+   "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "
    "AND Job.JobType='V' "
    "AND Job.Level='V' "
@@ -107,7 +108,7 @@ char *select_verify_del =
 char *select_restore_del =
    "SELECT DelCandidates.JobId "
    "FROM Job,DelCandidates "
-   "WHERE Job.JobTDate >= %s "
+   "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "   
    "AND Job.JobType='R'";
 

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index 994ae3ded8148c3607e4ffa304e4a2f0a798f59b..3189a6ed7bb3ee898a154bfdfcb17f22e0318fa6 100644 (file)
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -397,7 +397,7 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
     *  and stuff them into the "DeletionCandidates" table.
     */
    edit_uint64(now - period, ed1);
-   Mmsg(&query, insert_delcand, ed1, cr.ClientId);
+   Mmsg(&query, insert_delcand, (char)JobType, ed1, cr.ClientId);
    if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
       if (ua->verbose) {
          bsendmsg(ua, "%s", db_strerror(ua->db));

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index 67046da6ed11eb7a9af2dd1ab5fd8b093ca171b6..39b0d209845b3fd387a110bdc31c15c61fc1d443 100644 (file)
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -201,7 +201,7 @@ int restorecmd(UAContext *ua, char *cmd)
       }
 
    }
-   bsendmsg(ua, "\n");
+   bsendmsg(ua, "%d items inserted into the tree and marked for extraction.\n");
    free_pool_memory(query);
 
    /* Check MediaType and select storage that corresponds */

diff --git a/bacula/src/version.h b/bacula/src/version.h
index f582505abf8fde271cdce94e913f0c5782fe343a..ba27ddc105dae3e33cb04a7cdcc00f3ee3c93ff5 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #define VERSION "1.28"
 #define VSTRING "1"
-#define DATE    "18 December 2002"
-#define LSMDATE "18Dec02"
+#define DATE    "19 December 2002"
+#define LSMDATE "19Dec02"
 
 /* Debug flags */
 #define DEBUG 1