From b14d4c24bbba9fb0cf8757dc69f6e8624bc14128 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 9 Jun 2012 10:41:07 +0200 Subject: [PATCH] Apply systemd patch from bug #1886 --- bacula/autoconf/configure.in | 1 + bacula/platforms/systemd/Makefile.in | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 228a49bdcc..1565b14c3c 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -3203,6 +3203,7 @@ AC_ARG_WITH(systemd, PFILES="${PFILES} \ platforms/systemd/Makefile \ + platforms/systemd/bacula.conf \ platforms/systemd/bacula-dir.service \ platforms/systemd/bacula-fd.service \ platforms/systemd/bacula-sd.service" diff --git a/bacula/platforms/systemd/Makefile.in b/bacula/platforms/systemd/Makefile.in index d07d61c722..c3da39c347 100644 --- a/bacula/platforms/systemd/Makefile.in +++ b/bacula/platforms/systemd/Makefile.in @@ -11,13 +11,17 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ # should be /lib/systemd/system and get be get with # systemctl show | grep UnitPath | cut -d " " -f2 SYSTEMD_UNITDIR = @SYSTEMD_UNITDIR@ +SYSTEMD_TMPFILES = /etc/tmpfiles.d nothing: -install: install-dir install-autostart +install: install-dir install-conf install-autostart install-dir: $(DESTDIR)/$(SYSTEMD_UNITDIR) - mkdir -p $(DESTDIR)/$(SYSTEMD_UNITDIR) + mkdir -p $(DESTDIR)/$(SYSTEMD_UNITDIR) $(DESTDIR)/$(SYSTEMD_TMPFILES) + +install-conf: + @$(INSTALL_PROGRAM) -m 644 bacula.conf $(DESTDIR)/$(SYSTEMD_TMPFILES)/bacula.conf install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir @@ -61,7 +65,7 @@ install-autostart-dir: fi -uninstall: uninstall-autostart +uninstall: uninstall-autostart uninstall-conf uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir @@ -87,14 +91,17 @@ uninstall-autostart-dir: fi @rm -f $(DESTDIR)$(SYSTEMD_UNITDIR)/bacula-dir.service +uninstall-conf: + @rm -f $(DESTDIR)/$(SYSTEMD_TMPFILES)/bacula.conf + clean: @rm -f 1 2 3 distclean: clean @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec - @rm -f bacula-sd.service bacula-fd.service bacula-dir.service + @rm -f bacula.conf bacula-sd.service bacula-fd.service bacula-dir.service devclean: clean @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec - @rm -f bacula-sd.service bacula-fd.service bacula-dir.service + @rm -f bacula.conf bacula-sd.service bacula-fd.service bacula-dir.service -- 2.39.5