diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-09-03 15:09:20 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-03 11:09:07 +0100 |
commit | 23c943628249712eae86704218050f7ecdfa61a1 (patch) | |
tree | e76f9aaee133ee7e082e5829d4afa2cb6710290e /meta/recipes-kernel/modutils-initscripts | |
parent | 9105e9e3c498d1a9552bc98ce1003cd0afc615c0 (diff) | |
download | openembedded-core-contrib-23c943628249712eae86704218050f7ecdfa61a1.tar.gz |
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.
(From OE-Core rev: 8fc304a59bb3977146645fe2c3570a3aaa4aac39)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/modutils-initscripts')
-rw-r--r-- | meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb | 10 |
1 files changed, 10 insertions, 0 deletions
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 +} |