modutils-initscripts: mask modutils in case of systemd

We need to prevent the init script from running via systemd because
its functionality has been implemented interanlly in systemd.

In a systemd system, we can add configuration files under
/etc/modules-load.d/ to make things work.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
index 125f5fb073e908dd70c3ba0759482c7ea2c99276..7031ba142cf9b6d346e1e181fc01676bdc82d8d4 100644 (file)
--- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
@@ -18,3 +18,13 @@ do_install () {
        install -d ${D}${sysconfdir}/init.d/
        install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/
 }
+
+DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
+pkg_postinst_${PN} () {
+       if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+               if [ -n "$D" ]; then
+                       OPTS="--root=$D"
+               fi
+               systemctl $OPTS mask modutils.service
+       fi
+}