diff options
| author | Khem Raj <raj.khem@gmail.com> | 2012-08-04 20:05:31 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-08-08 09:02:31 +0200 |
| commit | b0032dca6939259409f9ea3c925c3af2f757c0b0 (patch) | |
| tree | 6147bc6ed7249e156a544bb491f44b5209ed0a6d | |
| parent | 980b338fb5100ff4c779335a86f3d9450ea8c54a (diff) | |
| download | meta-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>
| -rw-r--r-- | meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in | 1 | ||||
| -rw-r--r-- | meta-systemd/meta-oe/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 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 | |||
| 3 | Wants=busybox-klogd.service | 3 | Wants=busybox-klogd.service |
| 4 | 4 | ||
| 5 | [Service] | 5 | [Service] |
| 6 | ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service | ||
| 7 | EnvironmentFile=-/etc/default/busybox-syslog | 6 | EnvironmentFile=-/etc/default/busybox-syslog |
| 8 | ExecStart=@base_sbindir@/syslogd -n $OPTIONS | 7 | ExecStart=@base_sbindir@/syslogd -n $OPTIONS |
| 9 | Sockets=syslog.socket | 8 | 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 @@ | |||
| 1 | inherit systemd | 1 | inherit systemd |
| 2 | 2 | ||
| 3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
| 4 | 4 | ||
| 5 | # look for files in the layer first | 5 | # look for files in the layer first |
| 6 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 6 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
