kes Reapply my bat.conf install script in qt-console. I think I

     editted bat.pro instead of bat.pro.in and it was lost.
kes  Apply CentOS patches someone sent me. Checks for /var/run/subsys,
     the /var/lock/subsys for subsysdir.  Also corrects typos in the
     doc.

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 419878948820cd461beeb7a24d77faf295b95e19..b32e7410be2515d5fe6381cc4d37cb92e64947bd 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -960,7 +960,14 @@ AC_SUBST(piddir)
 # ------------------------------------
 # Where to place subsys "lock file"
 # ------------------------------------
-subsysdir=/var/run/subsys
+ubsysdir=/var/run/subsys
+if test -d /var/run/subsys; then
+   subsysdir=/var/run/subsys
+elif test -d /var/lock/subsys; then
+   subsysdir=/var/lock/subsys
+else
+   subsysdir=/var/run/subsys
+fi
 AC_ARG_WITH(subsys-dir,
     [  --with-subsys-dir=PATH   specify location of Bacula subsys file],
     [

diff --git a/bacula/configure b/bacula/configure
index 0ca88b11e813454efa67331803b50b43007c4331..6987e299aa2a4cfd6ee4ba70ad906dab4ffab0b4 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -18358,7 +18358,14 @@ _ACEOF
 # ------------------------------------
 # Where to place subsys "lock file"
 # ------------------------------------
-subsysdir=/var/run/subsys
+ubsysdir=/var/run/subsys
+if test -d /var/run/subsys; then
+   subsysdir=/var/run/subsys
+elif test -d /var/lock/subsys; then
+   subsysdir=/var/lock/subsys
+else
+   subsysdir=/var/run/subsys
+fi
 
 # Check whether --with-subsys-dir was given.
 if test "${with_subsys_dir+set}" = set; then

diff --git a/bacula/src/findlib/attribs.c b/bacula/src/findlib/attribs.c
index d747543e188cc62c3b76bc82c4afbf9930c4ad21..f04acee3b27794b359bb44cc1c78a56cf13ff5bc 100644 (file)
--- a/bacula/src/findlib/attribs.c
+++ b/bacula/src/findlib/attribs.c
@@ -403,7 +403,8 @@ bool set_attributes(JCR *jcr, ATTR *attr, BFILE *ofd)
       char ec1[50], ec2[50];
       fsize = blseek(ofd, 0, SEEK_END);
       bclose(ofd);                    /* first close file */
-      if (attr->type == FT_REG && fsize > 0 && fsize != (boffset_t)attr->statp.st_size) {
+      if (attr->type == FT_REG && fsize > 0 && attr->statp.st_size > 0 && 
+                        fsize != (boffset_t)attr->statp.st_size) {
          Jmsg3(jcr, M_ERROR, 0, _("File size of restored file %s not correct. Original %s, restored %s.\n"),
             attr->ofname, edit_uint64(attr->statp.st_size, ec1),
             edit_uint64(fsize, ec2));

diff --git a/bacula/src/lib/lex.c b/bacula/src/lib/lex.c
index 8eb6df75dbbe3543eb221a2b932122b041a1ffa1..e7fcc559e521bac84fe5bc05c97ea0728118bdd0 100644 (file)
--- a/bacula/src/lib/lex.c
+++ b/bacula/src/lib/lex.c
@@ -1,15 +1,7 @@
-/*
- * Lexical scanner for Bacula configuration file
- *
- *   Kern Sibbald, 2000
- *
- *   Version $Id$
- *
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-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.
@@ -33,6 +25,14 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ * Lexical scanner for Bacula configuration file
+ *
+ *   Kern Sibbald, 2000
+ *
+ *   Version $Id$
+ *
+ */
 
 #include "bacula.h"
 #include "lex.h"

diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index a7ee540f2875e356a966ec1193b4c45aa7b39b35..f781f18f3f0a0a8de742d9e373f2e116db3a49b0 100644 (file)
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -12,7 +12,7 @@ CONFIG += qt debug
 bins.path = /$(DESTDIR)@sbindir@
 bins.files = ./bat
 confs.path = /$(DESTDIR)@sysconfdir@
-confs.files = ./bat.conf
+confs.commands = ./install_conf_file   
 
 TEMPLATE = app
 TARGET = bat

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index aab57c1480abc949d79af6ea1961bf5a1094daab..1fd75de59a288a1cd39c1fc05d596cf905f82921 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,12 @@
               Technical notes on version 2.1
 
 General:
+29Apr07 
+kes  Reapply my bat.conf install script in qt-console. I think I 
+     editted bat.pro instead of bat.pro.in and it was lost.
+kes  Apply CentOS patches someone sent me. Checks for /var/run/subsys,
+     the /var/lock/subsys for subsysdir.  Also corrects typos in the
+     doc.
 28Apr07
 kes  First cut update job.
 kes  Correct configure to include qmake of src/qt-console directory.