From 9105e9e3c498d1a9552bc98ce1003cd0afc615c0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 3 Sep 2014 15:09:19 +0800 Subject: psplash: mask psplash in case of systemd We need to prevent the psplash init script from running via systemd because the script is supposed to be used by sysvinit system and it doesn't have any real effect in a systemd based system. (From OE-Core rev: 2e847db3ac3333a68b721b11624f4f515bda7ccf) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/psplash_git.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 628ced4d49..4e8f071a8e 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -109,3 +109,13 @@ FILES_${PN} += "/mnt/.psplash" INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." + +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 psplash.service + fi +} -- cgit v1.2.3-54-g00ecf