From 5a0b392b46c63e2c0c73047089e799827c92469c Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 25 Jan 2007 11:26:57 +0000 Subject: [PATCH] kes Change 'Device not configured to autolabel' from INFO to WARNING. kes Fix jobq.c to restart failed jobs when Reschedule Times = 0 which should restart an indefinite # of times. kes Fix configure --help to print --with-mysql[=DIR]. Same for other DIR specifications. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4036 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/jobq.c | 1 - bacula/src/gnome2-console/test-gnome-console.conf | 2 +- bacula/src/stored/mount.c | 4 ++-- bacula/technotes-2.1 | 6 +++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bacula/src/dird/jobq.c b/bacula/src/dird/jobq.c index ca52baba6d..03230dae10 100755 --- a/bacula/src/dird/jobq.c +++ b/bacula/src/dird/jobq.c @@ -495,7 +495,6 @@ void *jobq_server(void *arg) if (jcr->job->RescheduleOnError && jcr->JobStatus != JS_Terminated && jcr->JobStatus != JS_Canceled && - jcr->job->RescheduleTimes > 0 && jcr->JobType == JT_BACKUP && (jcr->job->RescheduleTimes == 0 || jcr->reschedule_count < jcr->job->RescheduleTimes)) { diff --git a/bacula/src/gnome2-console/test-gnome-console.conf b/bacula/src/gnome2-console/test-gnome-console.conf index b2725a1f9f..fa5f9bcd4e 100644 --- a/bacula/src/gnome2-console/test-gnome-console.conf +++ b/bacula/src/gnome2-console/test-gnome-console.conf @@ -5,6 +5,6 @@ Director { Name = rufus-dir DIRport = 8101 - address = rufus + address = localhost Password = UA_password } diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c index 4dac477e24..6175d8bc26 100644 --- a/bacula/src/stored/mount.c +++ b/bacula/src/stored/mount.c @@ -10,7 +10,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2006 Free Software Foundation Europe e.V. + Copyright (C) 2002-2007 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -510,7 +510,7 @@ static int try_autolabel(DCR *dcr, bool opened) return try_read_vol; /* read label we just wrote */ } if (!dev->has_cap(CAP_LABEL) && dcr->VolCatInfo.VolCatBytes == 0) { - Jmsg(dcr->jcr, M_INFO, 0, _("Warning device %s not configured to autolabel Volumes.\n"), + Jmsg(dcr->jcr, M_WARNING, 0, _("Device %s not configured to autolabel Volumes.\n"), dev->print_name()); } /* If not removable, Volume is broken */ diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index fc6e977096..4a2b16df6b 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,7 +1,11 @@ Technical notes on version 2.1 General: -24Jan07 +25Jan07 +kes Change 'Device not configured to autolabel' from INFO + to WARNING. +kes Fix jobq.c to restart failed jobs when Reschedule Times = 0 + which should restart an indefinite # of times. kes Fix configure --help to print --with-mysql[=DIR]. Same for other DIR specifications. 23Jan07 -- 2.39.5