From: Chen Qi <Qi.Chen@windriver.com>
Date: Wed, 3 Sep 2014 07:09:20 +0000 (+0800)
Subject: modutils-initscripts: mask modutils in case of systemd
X-Git-Tag: 2015-4~1624
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8fc304a59bb3977146645fe2c3570a3aaa4aac39;p=openembedded-core.git

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 125f5fb073..7031ba142c 100644
--- 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
+}