From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 23 Apr 2003 09:55:20 +0000 (+0000)
Subject: Doc + FreeBSD compile problems
X-Git-Tag: Release-1.30~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=458ad918b84c590c1b90357ad18c36f83a03ca33;p=bacula%2Fbacula

Doc + FreeBSD compile problems


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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 491d1fa5e5..0f2169c5ec 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                  Kern's ToDo List
-                  18 April 2003 
+                  22 April 2003 
 
 Documentation to do: (a little bit at a time)
 - Document running a test version.
@@ -22,8 +22,7 @@ For 1.30 release:
 
 - Document new transparent Console commands and wait command.
 - Document new immediate File save configuration (walk user
-  through first save to file Volume with automatic Volume
-  labeling?).
+  through first save to file Volume with automatic Volume labeling?).
 - Document OPTIMIZE TABLE in MySQL
 - Document labeling a whole magazine using "cat"
 - Document Lutz Kittler's trick of using "Run Before Job" to
@@ -31,8 +30,7 @@ For 1.30 release:
 - Document Ludovic Strappazon's Win32 raw device save/restore.
 - Document not to restore .journal .autofsck
 - Document logrotate
-- Document default file backup
-- Document . command
+- Document . and @ commands
 - Document run when.
 
 - Figure out how to use ssh or stunnel to protect Bacula communications.
@@ -974,4 +972,3 @@ rufus-dir: Volume used once. Marking Volume "File0003" as Used.
 - Do not ignore SIGCHLD
 - Add Cleaning to list of volume statuses 
 - Implement run at "xxx"
-
diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in
index 9eface5fd8..1b1e7d2801 100644
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -94,7 +94,7 @@ FileSet {
 # If you backup the root directory, the following two excluded
 #   files can be useful
 #
-  Exclude = { /proc; /tmp }
+  Exclude = { /proc /tmp /.journal /.fsck }
 }
 
 #
diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index d5481b5e96..79ca09e870 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -125,7 +125,6 @@ void run_job(JCR *jcr)
 			    jcr->catalog->db_port, jcr->catalog->db_socket);
    if (!db_open_database(jcr, jcr->db)) {
       Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
-      db_close_database(jcr, jcr->db);
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       free_jcr(jcr);
       return;
@@ -138,7 +137,6 @@ void run_job(JCR *jcr)
    jcr->jr.JobStatus = jcr->JobStatus;
    if (!db_create_job_record(jcr, jcr->db, &jcr->jr)) {
       Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
-      db_close_database(jcr, jcr->db);
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       free_jcr(jcr);
       return;
@@ -590,6 +588,10 @@ void set_jcr_defaults(JCR *jcr, JOB *job)
       case JT_BACKUP:
 	 jcr->JobLevel = L_INCREMENTAL;
 	 break;
+      case JT_RESTORE:
+      case JT_ADMIN:
+	 jcr->JobLevel = L_FULL;
+	 break;
       default:
 	 break;
       }
diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c
index ba24a153c1..22505364d4 100644
--- a/bacula/src/lib/bnet_server.c
+++ b/bacula/src/lib/bnet_server.c
@@ -25,6 +25,7 @@
   */
 
 #include "bacula.h"
+#undef DEV_BSIZE
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -36,6 +37,7 @@
 #include <resolv.h>
 #endif
 
+
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 #ifdef HAVE_LIBWRAP