Many of the init scripts in here will do nasty things if systemd decides to run them. Mask the obviously bad ones so that systemd won't attempt to invoke them if initscripts is installed with systemd.
Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-core/initscripts/initscripts_1.0.bb | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index d1644a3..20c0257 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -41,6 +41,7 @@ KERNEL_VERSION = "" inherit update-alternatives DEPENDS_append = " update-rc.d-native" +DEPENDS_append = " ${@base_contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" PACKAGES =+ "${PN}-functions" RDEPENDS_${PN} = "${PN}-functions" @@ -134,3 +135,27 @@ do_install () { # populate-volatile.sh update-rc.d -r ${D} dmesg.sh start 38 S . } + +MASKED_SCRIPTS = " \ + banner \ + bootmisc \ + checkroot \ + devpts \ + hostname \ + mountall \ + mountnfs \ + rmnologin \ + sysfs \ + urandom" + +pkg_postinst_${PN} () { + if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if [ -n "$D" ]; then + OPTS="--root=$D" + fi + for SERVICE in ${MASKED_SCRIPTS}; do + systemctl $OPTS mask $SERVICE.service + done + fi +fi +} -- 1.7.10.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
