]> code.ossystems Code Review - openembedded-core.git/commitdiff
procps: install symlink under /etc/sysctl.d in case of systemd
authorChen Qi <Qi.Chen@windriver.com>
Sun, 9 Nov 2014 07:03:41 +0000 (15:03 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 31 Dec 2014 10:17:28 +0000 (10:17 +0000)
Install /etc/sysctl.d/99-sysctl.conf symlink in case of systemd so
that /etc/sysctl.conf is taken into consideration by systemd-sysctl.

(From OE-Core rev: a32869fcbcb5f31741a32fdca14e7f38c2abace6)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-extended/procps/procps_3.2.8.bb

index 6211a7c955e6d8eff5e60486eeadeac5db04cbdb..fcfde194f18863bcc0509559534466c95fbd474d 100644 (file)
@@ -28,6 +28,10 @@ EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -I${STAGING_INCDIR}" \
 do_install_append () {
        install -d ${D}${sysconfdir}
        install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf
+       if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+               install -d ${D}${sysconfdir}/sysctl.d
+               ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf
+       fi
 }
 
 CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"