[oe-commits] Khem Raj : busybox: stopping systemd-kmsg-syslogd is not needed
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 8 07:10:34 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: b0032dca6939259409f9ea3c925c3af2f757c0b0
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b0032dca6939259409f9ea3c925c3af2f757c0b0
Author: Khem Raj <raj.khem at gmail.com>
Date: Sat Aug 4 20:05:31 2012 +0000
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 at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
.../busybox/busybox/busybox-syslog.service.in | 1 -
.../recipes-core/busybox/busybox_1.19.4.bbappend | 2 +-
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 27b9831..c6c625e 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 a0ae2ce..915a50e 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}:"
More information about the Openembedded-commits
mailing list