Doc update + update VolRetention in DB

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 261548fea55c4417ad7a2b09db5b838c9007c0a7..0cdea84392a60c86edb90031effc16ccfa3d9b33 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -8,6 +8,7 @@ To do:
 - Document saving MySQL databases, where to find code for shutting 
   down and saving other databases.
   http://www.backupcentral.com/free-backup-software1.html
+- Document tape cycling 
 
 Test:
 - that restore options work in FD.
@@ -16,6 +17,7 @@ Test:
 - blocksize recognition code.
 
 For 1.27 release:
+- Implement FileOptions.
 - Need return status on read_cb() from read_records(). Need multiple
   records -- one per Job, maybe a JCR or some other structure with
   a block and a record.

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 520c1b553a10faee2074be66eed5ebaf97f5ccb8..2abe4d4d9883bc304d424188a22ee59e8af23a8e 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -153,13 +153,15 @@ int
 db_update_pool_record(B_DB *mdb, POOL_DBR *pr)
 {
    int stat;
+   char ec1[50];
 
    db_lock(mdb);
    Mmsg(&mdb->cmd,
 "UPDATE Pool SET NumVols=%d, MaxVols=%d, UseOnce=%d, UseCatalog=%d, \
-AcceptAnyVolume=%d, LabelFormat='%s' WHERE PoolId=%u",
+AcceptAnyVolume=%d, VolRetention='%s',LabelFormat='%s' WHERE PoolId=%u",
       pr->NumVols, pr->MaxVols, pr->UseOnce, pr->UseCatalog,
-      pr->AcceptAnyVolume, pr->LabelFormat, pr->PoolId);
+      pr->AcceptAnyVolume, edit_uint64(pr->VolRetention, ed1),
+      pr->LabelFormat, pr->PoolId);
 
    stat = UPDATE_DB(mdb, mdb->cmd);
    db_unlock(mdb);

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 3e7d13e614f4f3a6f71ca82dcead57b1011aa7b7..75f744fa5e41bf4d5c2c09bc2b869d5c5eaa199d 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -742,6 +742,7 @@ static int update_pool(UAContext *ua)
    pr.UseOnce = pool->use_volume_once;
    pr.UseCatalog = pool->use_catalog;
    pr.AcceptAnyVolume = pool->accept_any_volume;
+   pr.VolRetention = pool->VolRetention;
    if (pool->label_format) {
       strcpy(pr.LabelFormat, pool->label_format);
    } else {