initscripts: remove obsolete systemd masking

systemd no longer has sysvinit compatibility[1], so it won't try and run
the init script in this recipe that is also implemented by systemd.

Remove the explicit systemd unit masking, effectively reverting [2].

[1] oe-core d9ec9e20eeb ("systemd: Stop supporting sysvinit compatibility")
[2] oe-core 844f897710 ("initscripts: mask initscripts from systemd")

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 23411b6a71492c40cf3f982d1255c87e2857944a..ae386a62818877973570622f93d4f274a25ef770 100644 (file)
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -41,7 +41,6 @@ S = "${UNPACKDIR}"
 KERNEL_VERSION = ""
 
 DEPENDS:append = " update-rc.d-native"
-PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
 
 PACKAGES =+ "${PN}-functions ${PN}-sushell"
 RDEPENDS:${PN} = "initd-functions \
@@ -154,32 +153,7 @@ do_install () {
        update-rc.d -r ${D} dmesg.sh start 38 S .
 }
 
-MASKED_SCRIPTS = " \
-  banner \
-  bootmisc \
-  checkfs \
-  checkroot \
-  devpts \
-  dmesg \
-  hostname \
-  mountall \
-  mountnfs \
-  populate-volatile \
-  read-only-rootfs-hook \
-  rmnologin \
-  sysfs \
-  urandom"
-
 pkg_postinst:${PN} () {
-       if type systemctl >/dev/null 2>/dev/null; then
-               if [ -n "$D" ]; then
-                       OPTS="--root=$D"
-               fi
-               for SERVICE in ${MASKED_SCRIPTS}; do
-                       systemctl $OPTS mask $SERVICE.service
-               done
-       fi
-
     # Delete any old volatile cache script, as directories may have moved
     if [ -z "$D" ]; then
         rm -f "/etc/volatile.cache"