From 2bdd9724ee66eb1dad514afad1f0e1cefbfdb8d0 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Sun, 4 Oct 2015 19:29:34 +0200 Subject: [PATCH] audit: Add systemd support The main .service file is installed by audit. We are using tmpfiles mechanisms to create the log directory, which would not exists otherwise since /var/log points to /tmp [Thomas: add explicit --disable-systemd when systemd is not used.] Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/audit/audit.mk | 16 ++++++++++++++++ package/audit/audit_tmpfiles.conf | 1 + 2 files changed, 17 insertions(+) create mode 100644 package/audit/audit_tmpfiles.conf diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 7548135822..329f8c5aca 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -31,10 +31,26 @@ ifeq ($(BR2_aarch64),y) AUDIT_CONF_OPTS += --with-aarch64 endif +ifeq ($(BR2_INIT_SYSTEMD),y) +AUDIT_CONF_OPTS += --enable-systemd +else +AUDIT_CONF_OPTS += --disable-systemd +endif + define AUDIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/audit/S01auditd $(TARGET_DIR)/etc/init.d/S01auditd endef +define AUDIT_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/auditd.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/auditd.service + + mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d + $(INSTALL) -D -m 644 package/audit/audit_tmpfiles.conf \ + $(TARGET_DIR)/usr/lib/tmpfiles.d/audit.conf +endef + define AUDIT_INSTALL_CLEANUP $(RM) -rf $(TARGET_DIR)/etc/rc.d $(RM) -rf $(TARGET_DIR)/etc/sysconfig diff --git a/package/audit/audit_tmpfiles.conf b/package/audit/audit_tmpfiles.conf new file mode 100644 index 0000000000..6b8325b595 --- /dev/null +++ b/package/audit/audit_tmpfiles.conf @@ -0,0 +1 @@ +d /var/log/audit 0755 - - -- 2.30.2