From b0032dca6939259409f9ea3c925c3af2f757c0b0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 4 Aug 2012 20:05:31 +0000 Subject: [PATCH] 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 Signed-off-by: Koen Kooi --- .../recipes-core/busybox/busybox/busybox-syslog.service.in | 1 - .../meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend | 2 +- 2 files changed, 1 insertion(+), 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}:"