summaryrefslogtreecommitdiffstats
path: root/meta-systemd
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-08-04 20:05:31 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-08-08 09:02:31 +0200
commitb0032dca6939259409f9ea3c925c3af2f757c0b0 (patch)
tree6147bc6ed7249e156a544bb491f44b5209ed0a6d /meta-systemd
parent980b338fb5100ff4c779335a86f3d9450ea8c54a (diff)
downloadmeta-openembedded-b0032dca6939259409f9ea3c925c3af2f757c0b0.tar.gz
busybox: stopping systemd-kmsg-syslogd is not needed
systemd-kmsg-syslogd.service is discontinued in systemd so there is no need to stop it. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-systemd')
-rw-r--r--meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in1
-rw-r--r--meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend2
2 files changed, 1 insertions, 2 deletions
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
index 27b9831da..c6c625ec5 100644
--- a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
@@ -3,7 +3,6 @@ Description=System Logging Service
3Wants=busybox-klogd.service 3Wants=busybox-klogd.service
4 4
5[Service] 5[Service]
6ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
7EnvironmentFile=-/etc/default/busybox-syslog 6EnvironmentFile=-/etc/default/busybox-syslog
8ExecStart=@base_sbindir@/syslogd -n $OPTIONS 7ExecStart=@base_sbindir@/syslogd -n $OPTIONS
9Sockets=syslog.socket 8Sockets=syslog.socket
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
index a0ae2ce18..915a50ebf 100644
--- a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -1,6 +1,6 @@
1inherit systemd 1inherit systemd
2 2
3PRINC := "${@int(PRINC) + 1}" 3PRINC := "${@int(PRINC) + 2}"
4 4
5# look for files in the layer first 5# look for files in the layer first
6FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 6FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"