bacula: Correction to 9.6.5

Message ID 20200728181743.16160-1-michael.tremer@ipfire.org
State Accepted
Commit be7f8b800302c3b3198491cbc7ec323e0c7bdb2d
Headers
Series bacula: Correction to 9.6.5 |

Commit Message

Michael Tremer July 28, 2020, 6:17 p.m. UTC
  From: Adolf Belka <ahb.ipfire@gmail.com>

- 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<ahb.ipfire@gmail.com>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/packages/bacula | 1 +
 lfs/bacula                       | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
  

Patch

diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula
index 4ee408fc4..dc9179489 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 1e4db011b..f5220bf16 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)