diff mbox

[v2,09/25] rsyslog: fix systemd service installation

Message ID 1426878856-15747-10-git-send-email-mike@mikebwilliams.com
State Superseded
Headers show

Commit Message

Mike Williams March 20, 2015, 7:14 p.m. UTC
Signed-off-by: Mike Williams <mike@mikebwilliams.com>
---
 package/rsyslog/rsyslog.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni March 20, 2015, 7:38 p.m. UTC | #1
Dear Mike Williams,

On Fri, 20 Mar 2015 15:14:00 -0400, Mike Williams wrote:

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

Are you sure?

Isn't the syslog.service -> rsyslog.service symbolic link meant to have
kind of a "compatibility" service name? If so, shouldn't this symlink
be in /usr/lib/systemd/system/ instead ?

Thomas
Mike Williams March 23, 2015, 3:08 p.m. UTC | #2
Thomas,

On Fri, Mar 20, 2015 at 3:38 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Mike Williams,
>
> On Fri, 20 Mar 2015 15:14:00 -0400, Mike Williams wrote:
>
>>  define RSYSLOG_INSTALL_INIT_SYSTEMD
>> -     ln -sf /lib/systemd/system/rsyslog.service \
>> +     ln -fs ../../../usr/lib/systemd/system/rsyslog.service \
>>               $(TARGET_DIR)/etc/systemd/system/syslog.service
>
> Are you sure?
>
> Isn't the syslog.service -> rsyslog.service symbolic link meant to have
> kind of a "compatibility" service name? If so, shouldn't this symlink
> be in /usr/lib/systemd/system/ instead ?

I enabled it on the target with 'systemctl enable' and duplicated the
steps in the .mk file

# systemctl enable rsyslog.service
Created symlink from /etc/systemd/system/syslog.service to
/usr/lib/systemd/system/rsyslog.service.
Created symlink from
/etc/systemd/system/multi-user.target.wants/rsyslog.service to
/usr/lib/systemd/system/rsyslog.service.

However, we should add a mkdir -p /etc/systemd/system before. Would
you like me to send a new patch?

Mike
diff mbox

Patch

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index c6758eb..e3c9d1a 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -65,11 +65,11 @@  define RSYSLOG_INSTALL_INIT_SYSV
 endef
 
 define RSYSLOG_INSTALL_INIT_SYSTEMD
-	ln -sf /lib/systemd/system/rsyslog.service \
+	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