bacula: several fixes

diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula
new file mode 100644 (file)
index 0000000..8d5c119
--- /dev/null
+++ b/config/backup/includes/bacula
@@ -0,0 +1 @@
+/etc/bacula/

diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula
index 8fadc7abf49be25d19104fe4a67b87471e41f2f8..908434795bead4e6f66d204b8938fbdcadab77fd 100644 (file)
--- a/config/rootfiles/packages/bacula
+++ b/config/rootfiles/packages/bacula
@@ -15,24 +15,23 @@ etc/bacula/bacula-fd.conf
 #etc/bacula/mtx-changer
 #etc/bacula/mtx-changer.conf
 etc/rc.d/init.d/bacula
 #etc/bacula/mtx-changer
 #etc/bacula/mtx-changer.conf
 etc/rc.d/init.d/bacula

-#var/bacula
-var/bacula/working
-sbin/bacula-fd
-#sbin/bconsole
-#sbin/btraceback

 usr/lib/bpipe-fd.so
 usr/lib/libbac-5.2.13.so
 usr/lib/bpipe-fd.so
 usr/lib/libbac-5.2.13.so

-usr/lib/libbac.la
-usr/lib/libbac.so
+#usr/lib/libbac.la
+#usr/lib/libbac.so

 usr/lib/libbaccfg-5.2.13.so
 usr/lib/libbaccfg-5.2.13.so

-usr/lib/libbaccfg.la
-usr/lib/libbaccfg.so
+#usr/lib/libbaccfg.la
+#usr/lib/libbaccfg.so

 usr/lib/libbacfind-5.2.13.so
 usr/lib/libbacfind-5.2.13.so

-usr/lib/libbacfind.la
-usr/lib/libbacfind.so
+#usr/lib/libbacfind.la
+#usr/lib/libbacfind.so

 usr/lib/libbacpy-5.2.13.so
 usr/lib/libbacpy-5.2.13.so

-usr/lib/libbacpy.la
-usr/lib/libbacpy.so
+#usr/lib/libbacpy.la
+#usr/lib/libbacpy.so
+#usr/sbin/bacula
+usr/sbin/bacula-fd
+#usr/sbin/bconsole
+#usr/sbin/btraceback

 #usr/share/doc/bacula
 #usr/share/doc/bacula/ChangeLog
 #usr/share/doc/bacula/INSTALL
 #usr/share/doc/bacula
 #usr/share/doc/bacula/ChangeLog
 #usr/share/doc/bacula/INSTALL


@@ -59,3 +58,5 @@ usr/lib/libbacpy.so
 #usr/share/man/man8/btraceback.8.gz
 #usr/share/man/man8/bwild.8.gz
 #usr/share/man/man8/dbcheck.8.gz
 #usr/share/man/man8/btraceback.8.gz
 #usr/share/man/man8/bwild.8.gz
 #usr/share/man/man8/dbcheck.8.gz

+#var/bacula
+var/bacula/working

diff --git a/lfs/bacula b/lfs/bacula
index 54864b229595dfe1b81aaddbeb9357b23d9258ec..4d2fed6d448bad776fa6302c7455b16c86c438d9 100644 (file)
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -77,12 +77,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)

-       cd $(DIR_APP) && ./configure --enable-client-only
+       cd $(DIR_APP) && ./configure \
+                               --prefix=/usr \
+                               --sysconfdir=/etc/bacula \
+                               --with-working-dir=/var/bacula/working \
+                               --enable-client-only

        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

-       mv -f /sbin/bacula /etc/init.d/bacula
-       mv -f /opt/bacula /var/
-       sed -i -e 's#/opt/bacula/working#/var/bacula/working#' /etc/bacula/bacula-fd.conf
+       ln -s etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula

        rm -f /root/.rnd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        rm -f /root/.rnd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

+