busybox: enable shared memory logging for systemd
The default command-line options for launching busybox's syslogd are "-C" if using sysvinit; but because we use /etc/default/busybox-syslog when using systemd which the sysvinit initscript doesn't use, and no /etc/default/busybox-syslog is installed by default in OE-Core, the default arguments with systemd were no arguments at all with OE-Core alone. Effectively merge in the bbappend from meta-oe that adds a default file in order to set the default options to "-C" for systemd as well. (From OE-Core rev: a23aa8e7467cf2b7f4e8ff85a3aa841ff6b508e5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1506d3acaf
commit
b18b210c1e
|
@ -21,7 +21,7 @@ export EXTRA_LDFLAGS = "${LDFLAGS}"
|
|||
PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock"
|
||||
|
||||
FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
|
||||
FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${systemd_unitdir}/system/syslog.service"
|
||||
FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog"
|
||||
FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf"
|
||||
FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
|
||||
FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
|
||||
|
@ -272,6 +272,11 @@ do_install () {
|
|||
sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
|
||||
> ${D}${systemd_unitdir}/system/busybox-klogd.service
|
||||
|
||||
if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
|
||||
install -d ${D}${sysconfdir}/default
|
||||
install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
|
||||
fi
|
||||
|
||||
ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
|
||||
fi
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
|
|||
file://mount.busybox \
|
||||
file://syslog \
|
||||
file://syslog-startup.conf \
|
||||
file://busybox-syslog.default \
|
||||
file://mdev \
|
||||
file://mdev.conf \
|
||||
file://umount.busybox \
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
OPTIONS="-C"
|
Loading…
Reference in New Issue