diff mbox

[3/5] rsyslog: fix systemd service installation

Message ID 1429638638-28695-4-git-send-email-mike@mikebwilliams.com
State Superseded
Headers show

Commit Message

Mike Williams April 21, 2015, 5:50 p.m. UTC
Signed-off-by: Mike Williams <mike@mikebwilliams.com>
---
 package/rsyslog/rsyslog.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni April 22, 2015, 8:53 p.m. UTC | #1
Dear Mike Williams,

On Tue, 21 Apr 2015 13:50:36 -0400, Mike Williams wrote:

>  define RSYSLOG_INSTALL_INIT_SYSTEMD
> -	ln -sf /lib/systemd/system/rsyslog.service \
> +	mkdir -p $(TARGET_DIR)/etc/systemd/system
> +	ln -fs ../../../usr/lib/systemd/system/rsyslog.service \
>  		$(TARGET_DIR)/etc/systemd/system/syslog.service

Why are we doing this link? In all other systemd service installation,
we:

 1/ install to /usr/lib/systemd/system/ when the service file has not
    been installed by the package build system itself.

 2/ create a symlink
    from /etc/systemd/system/multi-user.target.wants/<foo>.service
    to /usr/lib/systemd/system/rsyslog.service

Why would we need this additional symlink here?

(Remember that when you're talking to me, you're talking to a complete
system newbie.)

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 99e6eba..0b7df4b 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -65,11 +65,12 @@  define RSYSLOG_INSTALL_INIT_SYSV
 endef
 
 define RSYSLOG_INSTALL_INIT_SYSTEMD
-	ln -sf /lib/systemd/system/rsyslog.service \
+	mkdir -p $(TARGET_DIR)/etc/systemd/system
+	ln -fs ../../../usr/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 -fs ../../../../usr/lib/systemd/system/rsyslog.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rsyslog.service
 endef
 
 define RSYSLOG_INSTALL_CONF