{ "due", due,
T_(" [<hostname> [<disks>]* ]*\t # Show due date.") },
{ "balance", balance,
- T_(" [-days <num>]\t\t # Show nightly dump size balance.") },
+ T_(" [--days <num>]\t\t # Show nightly dump size balance.") },
{ "tape", tape,
- T_(" [-days <num>]\t\t # Show which tape is due next.") },
+ T_(" [--days <num>]\t\t # Show which tape is due next.") },
{ "bumpsize", bumpsize,
T_("\t\t\t # Show current bump thresholds.") },
{ "export", export_db,
goto done;
}
- config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_FATAL, argv[1]);
+ config_init(CONFIG_INIT_EXPLICIT_NAME, argv[1]);
apply_config_overwrites(cfg_ovr);
- dbrename(config_name, DBG_SUBDIR_SERVER);
-
- check_running_as(RUNNING_AS_DUMPUSER);
-
conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
- if (read_diskfile(conf_diskfile, &diskq) < 0) {
- error(_("could not load disklist \"%s\""), conf_diskfile);
- /*NOTREACHED*/
- }
+ read_diskfile(conf_diskfile, &diskq);
amfree(conf_diskfile);
+ if (config_errors(NULL) >= CFGERR_WARNINGS) {
+ config_print_errors();
+ if (config_errors(NULL) >= CFGERR_ERRORS) {
+ g_critical(_("errors processing config file"));
+ }
+ }
+
+ dbrename(get_config_name(), DBG_SUBDIR_SERVER);
+
+ check_running_as(RUNNING_AS_DUMPUSER);
+
conf_tapelist = config_dir_relative(getconf_str(CNF_TAPELIST));
if(read_tapelist(conf_tapelist)) {
error(_("could not load tapelist \"%s\""), conf_tapelist);
get_pname(), hostname, diskname);
}
if(put_info(hostname, diskname, &info) == 0) {
- g_printf(_("%s: %s:%s is set to a forced level 0 at next run.\n"),
- get_pname(), hostname, diskname);
+ if (dp->strategy == DS_INCRONLY) {
+ g_printf(_("%s: %s:%s, full dump done offline, next dump will be at level 1.\n"),
+ get_pname(), hostname, diskname);
+ } else {
+ g_printf(_("%s: %s:%s is set to a forced level 0 at next run.\n"),
+ get_pname(), hostname, diskname);
+ }
} else {
g_fprintf(stderr, _("%s: %s:%s could not be forced.\n"),
get_pname(), hostname, diskname);
int argc,
char ** argv)
{
- tape_t *tp, *lasttp;
- int runtapes, i, j;
- int nb_days = 1;
+ int nb_days = 1;
+ int runtapes;
+ tape_t *tp;
+ int i, j;
+ int skip;
+ int nb_new_tape;
if(argc > 4 && strcmp(argv[3],"--days") == 0) {
nb_days = atoi(argv[4]);
runtapes = getconf_int(CNF_RUNTAPES);
tp = lookup_last_reusable_tape(0);
+ skip = 0;
for ( j=0 ; j < nb_days ; j++ ) {
+ nb_new_tape=0;
for ( i=0 ; i < runtapes ; i++ ) {
if(i==0)
- g_printf(_("The next Amanda run should go onto "));
- else
- g_printf(" ");
+ g_fprintf(stdout, _("The next Amanda run should go onto "));
if(tp != NULL) {
- g_printf(_("tape %s or a new tape.\n"), tp->label);
+ if (nb_new_tape > 0) {
+ if (nb_new_tape == 1)
+ g_fprintf(stdout, _("1 new tape.\n"));
+ else
+ g_fprintf(stdout, _("%d new tapes.\n"), nb_new_tape);
+ g_fprintf(stdout, " ");
+ nb_new_tape = 0;
+ }
+ g_fprintf(stdout, _("tape %s or a new tape.\n"), tp->label);
+ if (i < runtapes-1)
+ g_fprintf(stdout, " ");
} else {
- if (runtapes - i == 1)
- g_printf(_("1 new tape.\n"));
- else
- g_printf(_("%d new tapes.\n"), runtapes - i);
- i = runtapes;
+ nb_new_tape++;
}
-
- tp = lookup_last_reusable_tape(i + 1);
- }
- }
- lasttp = lookup_tapepos(lookup_nb_tape());
- i = runtapes;
- if(lasttp && i > 0 && strcmp(lasttp->datestamp,"0") == 0) {
- int c = 0;
- while(lasttp && i > 0 && strcmp(lasttp->datestamp,"0") == 0) {
- c++;
- lasttp = lasttp->prev;
- i--;
- }
- lasttp = lookup_tapepos(lookup_nb_tape());
- i = runtapes;
- if(c == 1) {
- g_printf(_("The next new tape already labelled is: %s.\n"),
- lasttp->label);
+ skip++;
+
+ tp = lookup_last_reusable_tape(skip);
}
- else {
- g_printf(_("The next %d new tapes already labelled are: %s"), c,
- lasttp->label);
- lasttp = lasttp->prev;
- c--;
- while(lasttp && c > 0 && strcmp(lasttp->datestamp,"0") == 0) {
- g_printf(", %s", lasttp->label);
- lasttp = lasttp->prev;
- c--;
- }
- g_printf(".\n");
+ if (nb_new_tape > 0) {
+ if (nb_new_tape == 1)
+ g_fprintf(stdout, _("1 new tape.\n"));
+ else
+ g_fprintf(stdout, _("%d new tapes.\n"), nb_new_tape);
}
}
+
+ print_new_tapes(stdout, nb_days * runtapes);
}
/* ----------------------------------------------- */
if(argc < 3) {
g_fprintf(stderr,
- _("%s: expecting \"find [--sort <hkdlpbf>] [hostname [<disk>]]*\"\n"),
+ _("%s: expecting \"find [--sort <hkdlpbfw>] [hostname [<disk>]]*\"\n"),
get_pname());
usage();
}
case 'P':
case 'b':
case 'B':
+ case 'w':
+ case 'W':
break;
default: valid_sort=0;
}
}
if (get_info(file.name, file.disk, &info) == -1) {
- g_printf(_("WARNING: No curinfo record for %s:%s\n"), file.name, file.disk);
- return 1; /* not an error */
+ g_printf(_("WARNING: No curinfo record for %s:%s\n"), file.name, file.disk);
+ dumpfile_free_data(&file);
+ return 1; /* not an error */
}
matching_hist_idx = holding_file_find_history(&info, &file);
if (matching_hist_idx == -1) {
g_printf(_("WARNING: No dump matching %s found in curinfo.\n"), filename);
+ dumpfile_free_data(&file);
return 1; /* not an error */
}
matching_hist = info.history[matching_hist_idx];
/* Remove the history element itself before doing the stats */
- for (i = matching_hist_idx; i <= NB_HISTORY; i++) {
+ for (i = matching_hist_idx; i < NB_HISTORY; i++) {
info.history[i] = info.history[i+1];
}
info.history[NB_HISTORY].level = -1;
/* write out the changes */
if (put_info(file.name, file.disk, &info) == -1) {
- g_printf(_("Could not write curinfo record for %s:%s\n"), file.name, file.disk);
- return 0;
+ g_printf(_("Could not write curinfo record for %s:%s\n"), file.name, file.disk);
+ dumpfile_free_data(&file);
+ return 0;
}
+ dumpfile_free_data(&file);
return 1;
}
}
}
amfree(dumpstr);
+ dumpfile_free_data(&file);
}
g_slist_free_full(file_list);
break;
am_host_t *hp;
netif_t *ip;
sle_t *excl;
+ pp_scriptlist_t pp_scriptlist;
hp = dp->host;
ip = hp->netif;
g_printf(" interface %s\n",
interface_name(ip->config)[0] ? interface_name(ip->config) : "default");
g_printf(" disk %s:\n", dp->name);
- if(dp->device) g_printf(" device %s\n", dp->device);
+ if (dp->device) g_printf(" device %s\n", dp->device);
g_printf(" program \"%s\"\n", dp->program);
- if(dp->exclude_file != NULL && dp->exclude_file->nb_element > 0) {
+ if (dp->application)
+ g_printf(" application \"%s\"\n", application_name(dp->application));
+ if (dp->exclude_file != NULL && dp->exclude_file->nb_element > 0) {
g_printf(" exclude file");
for(excl = dp->exclude_file->first; excl != NULL; excl = excl->next) {
g_printf(" \"%s\"", excl->name);
}
g_printf("\n");
}
- if(dp->exclude_list != NULL && dp->exclude_list->nb_element > 0) {
+ if (dp->exclude_list != NULL && dp->exclude_list->nb_element > 0) {
g_printf(" exclude list");
if(dp->exclude_optional) g_printf(" optional");
for(excl = dp->exclude_list->first; excl != NULL; excl = excl->next) {
}
g_printf("\n");
}
- if(dp->include_file != NULL && dp->include_file->nb_element > 0) {
+ if (dp->include_file != NULL && dp->include_file->nb_element > 0) {
g_printf(" include file");
for(excl = dp->include_file->first; excl != NULL; excl = excl->next) {
g_printf(" \"%s\"", excl->name);
}
g_printf("\n");
}
- if(dp->include_list != NULL && dp->include_list->nb_element > 0) {
+ if (dp->include_list != NULL && dp->include_list->nb_element > 0) {
g_printf(" include list");
- if(dp->include_optional) g_printf(" optional");
+ if (dp->include_optional) g_printf(" optional");
for(excl = dp->include_list->first; excl != NULL; excl = excl->next) {
g_printf(" \"%s\"", excl->name);
}
g_printf(" dumpcycle %d\n", dp->dumpcycle);
g_printf(" maxdumps %d\n", dp->maxdumps);
g_printf(" maxpromoteday %d\n", dp->maxpromoteday);
- if(dp->bumppercent > 0) {
+ if (dp->bumppercent > 0) {
g_printf(" bumppercent %d\n", dp->bumppercent);
}
else {
g_printf(" skip-incr %s\n", (dp->skip_incr? "YES" : "NO"));
g_printf(" skip-full %s\n", (dp->skip_full? "YES" : "NO"));
g_printf(" spindle %d\n", dp->spindle);
+ pp_scriptlist = dp->pp_scriptlist;
+ while (pp_scriptlist != NULL) {
+ g_printf(" script \"%s\"\n", (pp_script_name(pp_scriptlist->data)));
+ pp_scriptlist = pp_scriptlist->next;
+ }
+
+ {
+ dumptype_t *dtype;
+ char **prop, **p1;;
+
+ dtype = lookup_dumptype(dp->dtype_name);
+ prop = val_t_display_strs(dumptype_getconf((dtype), DUMPTYPE_PROPERTY),
+ 0);
+ for(p1 = prop; *p1 != NULL; p1++) {
+ g_printf(" property %s\n", *p1);
+ free(*p1);
+ }
+ amfree(prop);
+ }
g_printf("\n");
}
projects / debian / amanda / blobdiff