From: Chen Qi <Qi.Chen@windriver.com>
Date: Wed, 27 Mar 2013 08:27:25 +0000 (+0800)
Subject: sysvinit: rc: exit psplash correctly
X-Git-Tag: 2015-4~7027
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=70b14f1c4181d820e56e67f4a5d921905094dc62;p=openembedded-core.git

sysvinit: rc: exit psplash correctly

Previously, psplash didn't go away at system startup.
The root cause is that rc checks the file '/etc/init.d/xserver-nodm' to
determine whether to exit psplash manually. So even if xserver-nodm is not
linked into runlevel 3, psplash doesn't exit.

This patch fixes this problem by letting the rc script check the file
'/etc/rc${runlevel}.d/S??xserver-nodm' to determine whether to exit psplash
manually.

[YOCTO #3904]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc
index 44bc9bfd74..655a0b067c 100755
--- a/meta/recipes-core/sysvinit/sysvinit/rc
+++ b/meta/recipes-core/sysvinit/sysvinit/rc
@@ -171,7 +171,7 @@ startup() {
   fi
 
 #Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch
-if [ "x$runlevel" != "xS" ] && [ ! -x /etc/init.d/xserver-nodm ]; then
+if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then
     if type psplash-write >/dev/null 2>&1; then
         TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
     	umount /mnt/.psplash