From: Adolf Belka Date: Tue, 28 Jul 2020 18:17:43 +0000 (+0000) Subject: bacula: Correction to 9.6.5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be7f8b800302c3b3198491cbc7ec323e0c7bdb2d;p=people%2Fms%2Fipfire-2.x.git bacula: Correction to 9.6.5 - Corrected Download URL to remove filename from the end of it. This is defined separately. - Corrected to include install command for backup file which was missed in previous patch. - Added backup file to rootfiles list. Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula index 4ee408fc41..dc91794898 100644 --- a/config/rootfiles/packages/bacula +++ b/config/rootfiles/packages/bacula @@ -63,3 +63,4 @@ usr/sbin/bacula-fd #usr/share/man/man8/dbcheck.8.gz #var/bacula #var/bacula/working +var/ipfire/backup/addons/includes/bacula diff --git a/lfs/bacula b/lfs/bacula index 1e4db011b1..f5220bf163 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bacula -PAK_VER = 5 +PAK_VER = 6 DEPS = @@ -87,6 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula + install -v -m 644 ${DIR_SRC}/config/backup/includes/bacula \ + /var/ipfire/backup/addons/includes/bacula rm -f /root/.rnd @rm -rf $(DIR_APP) @$(POSTBUILD)