From 54c57639eea2a485c07e291b847f82eaf20c19d5 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 28 Apr 2007 21:24:18 +0000 Subject: [PATCH] kes First cut update job. kes Correct configure to include qmake of src/qt-console directory. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4648 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/configure.in | 7 +++- bacula/configure | 7 +++- bacula/kernstodo | 10 +++++- bacula/src/dird/ua_update.c | 63 ++++++++++++++++++++++++++++-------- bacula/src/version.h | 4 +-- bacula/technotes-2.1 | 3 ++ 6 files changed, 75 insertions(+), 19 deletions(-) diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 1c43f0fd55..a42cc2b018 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -2139,7 +2139,12 @@ chmod 755 $c/mysql chmod 755 src/win32/build-depkgs-mingw32 -chmod 755 src/qt-console/install_conf_file +if test "${support_bat}" = "yes" ; then +cd src/qt-console +chmod 755 install_conf_file +qmake +fi + if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then largefile_support="yes" diff --git a/bacula/configure b/bacula/configure index bcba46b0d3..6552e26b7e 100755 --- a/bacula/configure +++ b/bacula/configure @@ -35600,7 +35600,12 @@ chmod 755 $c/mysql chmod 755 src/win32/build-depkgs-mingw32 -chmod 755 src/qt-console/install_conf_file +if test "${support_bat}" = "yes" ; then +cd src/qt-console +chmod 755 install_conf_file +qmake +fi + if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then largefile_support="yes" diff --git a/bacula/kernstodo b/bacula/kernstodo index 7c7ab01e26..a03728d994 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -1,5 +1,5 @@ Kern's ToDo List - 12 November 2006 + 27 April 2007 Major development: Project Developer @@ -41,6 +41,14 @@ Document: - Document more precisely how to use master keys -- especially for disaster recovery. +Professional Needs: +- Migration from other vendors + - Date change + - Path change +- Filesystem types +- Backup conf/exe (all daemons) +- Backup up system state +- Detect state change of system (verify) Priority: - Please mount volume "xxx" on Storage device ... should also list diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c index 1b6c87b846..e28c4145e5 100644 --- a/bacula/src/dird/ua_update.c +++ b/bacula/src/dird/ua_update.c @@ -41,6 +41,7 @@ /* Forward referenced functions */ static int update_volume(UAContext *ua); static bool update_pool(UAContext *ua); +static bool update_job(UAContext *ua); /* * Update a Pool Record in the database. @@ -60,6 +61,7 @@ int update_cmd(UAContext *ua, const char *cmd) NT_("volume"), /* 1 */ NT_("pool"), /* 2 */ NT_("slots"), /* 3 */ + NT_("jobid"), /* 4 */ NULL}; if (!open_client_db(ua)) { @@ -77,6 +79,9 @@ int update_cmd(UAContext *ua, const char *cmd) case 3: update_slots(ua); return 1; + case 4: + update_job(ua); + return 1; default: break; } @@ -430,20 +435,20 @@ static int update_volume(UAContext *ua) bool done = false; int i; const char *kw[] = { - _("VolStatus"), /* 0 */ - _("VolRetention"), /* 1 */ - _("VolUse"), /* 2 */ - _("MaxVolJobs"), /* 3 */ - _("MaxVolFiles"), /* 4 */ - _("MaxVolBytes"), /* 5 */ - _("Recycle"), /* 6 */ - _("InChanger"), /* 7 */ - _("Slot"), /* 8 */ - _("Pool"), /* 9 */ - _("FromPool"), /* 10 */ - _("AllFromPool"), /* 11 !!! see below !!! */ - _("Enabled"), /* 12 */ - _("RecyclePool"), /* 13 */ + NT_("VolStatus"), /* 0 */ + NT_("VolRetention"), /* 1 */ + NT_("VolUse"), /* 2 */ + NT_("MaxVolJobs"), /* 3 */ + NT_("MaxVolFiles"), /* 4 */ + NT_("MaxVolBytes"), /* 5 */ + NT_("Recycle"), /* 6 */ + NT_("InChanger"), /* 7 */ + NT_("Slot"), /* 8 */ + NT_("Pool"), /* 9 */ + NT_("FromPool"), /* 10 */ + NT_("AllFromPool"), /* 11 !!! see below !!! */ + NT_("Enabled"), /* 12 */ + NT_("RecyclePool"), /* 13 */ NULL }; #define AllFromPool 11 /* keep this updated with above */ @@ -758,3 +763,33 @@ static bool update_pool(UAContext *ua) bsendmsg(ua, _("Pool DB record updated from resource.\n")); return true; } + +/* + * Update a Job record -- allows you to change the + * date fields in a Job record. This helps when + * providing migration from other vendors. + */ +static bool update_job(UAContext *ua) +{ + bool done = false; + int i; + const char *kw[] = { + NT_("StartTime"), /* 0 */ + NULL }; + + + for (i=0; kw[i]; i++) { + int j; + if ((j=find_arg_with_value(ua, kw[i])) > 0) { + switch (i) { + case 0: + break; + case 1: + break; + } + done = true; + } + } + + return true; +} diff --git a/bacula/src/version.h b/bacula/src/version.h index 3819dfdd56..9a68f9e52d 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,8 +4,8 @@ #undef VERSION #define VERSION "2.1.8" -#define BDATE "26 April 2007" -#define LSMDATE "26Apr07" +#define BDATE "28 April 2007" +#define LSMDATE "28Apr07" #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n" #define BYEAR "2007" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index abee15e7b3..aab57c1480 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,6 +1,9 @@ Technical notes on version 2.1 General: +28Apr07 +kes First cut update job. +kes Correct configure to include qmake of src/qt-console directory. 26Apr07 kes Make restore job yes/mod/no print in one command so GUI works. kes First cut implementing backup and restore client. -- 2.39.5