From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] bacula: Correction to 9.6.5 Date: Tue, 28 Jul 2020 18:17:43 +0000 Message-ID: <20200728181743.16160-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5123580639896107366==" List-Id: --===============5123580639896107366== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Adolf Belka - Corrected Download URL to remove filename from the end of it. This is defin= ed separately. - Corrected to include install command for backup file which was missed in pr= evious patch. - Added backup file to rootfiles list. Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer Signed-off-by: Michael Tremer --- config/rootfiles/packages/bacula | 1 + lfs/bacula | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bac= ula 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 =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D bacula -PAK_VER =3D 5 +PAK_VER =3D 6 =20 DEPS =3D =20 @@ -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) --=20 2.20.1 --===============5123580639896107366==--