From 652e515cbdf0f6314b63ec52b9fcac42299c3d60 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 10 Aug 2017 09:46:04 +0800 Subject: sysstat: fix creating configuration file for /var/log/sa Fix to create configuration file related to /var/log/sa for sysvinit and systemd systems respectively. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-extended/sysstat/sysstat.inc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 18b0861bf9..61da4cde0f 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -32,10 +32,16 @@ do_install() { autotools_do_install # don't install /var/log/sa when populating rootfs. Do it through volatile - rm -rf ${D}/var - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/log/sa - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf + fi install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system -- cgit 1.2.3-korg