diff options
-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 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 | |||
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 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 @@ | |||
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}:" |