aboutsummaryrefslogtreecommitdiffstats
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 27b9831da0..c6c625ec52 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
Wants=busybox-klogd.service
[Service]
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
EnvironmentFile=-/etc/default/busybox-syslog
ExecStart=@base_sbindir@/syslogd -n $OPTIONS
Sockets=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 a0ae2ce186..915a50ebf2 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 @@
inherit systemd
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"