[Buildroot] [git commit branch/next] rsyslog: Fix systemd service creation
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Sat Aug 8 10:57:48 UTC 2015
commit: http://git.buildroot.net/buildroot/commit/?id=0b8e10c2ed913b53646c26424893f43dc42cfa15
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
The rsyslog.service is installed by rsyslog, but the link is not created
so the service is not enabled.
In order to install the service file, use the correct configure flag.
So the INSTALL_INIT_SYSTEMD will create the link, it will also create
another link which is due to the fact that the rsyslog.service contains
an Alias=
If we were to use systemctl enable to enable the service, it would
create both,so we mimic that.
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
package/rsyslog/rsyslog.mk | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 261f59d..1de481f 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -57,17 +57,32 @@ else
RSYSLOG_CONF_OPTS += --disable-uuid
endif
+ifeq ($(BR2_INIT_SYSTEMD),y)
+RSYSLOG_CONF_OPTS += \
+ --enable-systemd \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+RSYSLOG_DEPENDENCIES += systemd
+else
+RSYSLOG_CONF_OPTS += --disable-systemd
+endif
+
define RSYSLOG_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/rsyslog/S01logging \
$(TARGET_DIR)/etc/init.d/S01logging
endef
+# The rsyslog.service is installed by rsyslog, but the link is not created
+# so the service is not enabled.
+# We need to create another link which is due to the fact that the
+# rsyslog.service contains an Alias=
+# If we were to use systemctl enable to enable the service, it would
+# create both, so we mimic that.
define RSYSLOG_INSTALL_INIT_SYSTEMD
- ln -sf /lib/systemd/system/rsyslog.service \
- $(TARGET_DIR)/etc/systemd/system/syslog.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
- ln -sf ../syslog.service \
- $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslog.service
+ ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \
+ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rsyslog.service
+ ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \
+ $(TARGET_DIR)/etc/systemd/system/syslog.service
endef
define RSYSLOG_INSTALL_CONF
More information about the buildroot
mailing list