busybox: enable shared memory logging for systemd
PATCH 1/1 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.
--- meta/recipes-core/busybox/busybox.inc | 7 ++++++- meta/recipes-core/busybox/busybox_1.21.1.bb | 1 + meta/recipes-core/busybox/files/busybox-syslog.default | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/busybox/files/busybox-syslog.default
meta/recipes-core/busybox/busybox.inc +6 -1
@@ -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
meta/recipes-core/busybox/busybox_1.21.1.bb +1 -0
@@ -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 \
meta/recipes-core/busybox/files/busybox-syslog.default new file +1 -0
@@ -0,0 +1 @@ +OPTIONS="-C"
Signature · 1 line
1.8.1.2
meta/recipes-core/busybox/busybox.inc do_install () { · line 279
Quoted 5 lines · Paul Eggleton
meta/recipes-core/busybox/busybox.inc +5
-0+ 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 +
Does this mean that sysvinit users will now get a decoy version of busybox-syslog.default which isn't actually used by anything?
p.
Hi Phil,
Quoted 9 lines · On Friday 23 August 2013 12:28:16 Phil Blundell wrote:
Quoted 5 lines · Paul Eggleton
meta/recipes-core/busybox/busybox.inc +3
-0+ 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
+Does this mean that sysvinit users will now get a decoy version of busybox-syslog.default which isn't actually used by anything?
These lines are being added into a block which is conditional upon systemd being in DISTRO_FEATURES, so no; however FYI the meta-oe bbappend was installing the file unconditionally.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre