浏览代码

package/sysklogd: fix installation path of the daemons

Use "--exec-prefix=/" to install syslogd and klogd at /sbin, as required
by the init scripts. This also ensures that the BusyBox counterparts are
not installed.

Update the systemd unit files, accordingly.

Signed-off-by: Carlos Santos <unixmania@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Carlos Santos 5 年之前
父节点
当前提交
33642d8d95
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      package/sysklogd/klogd.service
  2. 1 0
      package/sysklogd/sysklogd.mk
  3. 1 1
      package/sysklogd/syslogd.service

+ 1 - 1
package/sysklogd/klogd.service

@@ -2,7 +2,7 @@
 Description=Kernel Log Daemon
 
 [Service]
-ExecStart=/usr/sbin/klogd -n
+ExecStart=/sbin/klogd -n
 StandardOutput=null
 Restart=on-failure
 

+ 1 - 0
package/sysklogd/sysklogd.mk

@@ -10,6 +10,7 @@ SYSKLOGD_LICENSE = GPL-2.0+
 SYSKLOGD_LICENSE_FILES = COPYING
 # From git
 SYSKLOGD_AUTORECONF = YES
+SYSKLOGD_CONF_OPTS = --exec-prefix=/
 
 define SYSKLOGD_INSTALL_SAMPLE_CONFIG
 	$(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \

+ 1 - 1
package/sysklogd/syslogd.service

@@ -4,7 +4,7 @@ Requires=syslog.socket
 Wants=klogd.service
 
 [Service]
-ExecStart=/usr/sbin/syslogd -m 0 -n
+ExecStart=/sbin/syslogd -m 0 -n
 StandardOutput=null
 Restart=on-failure