[oe-commits] Chen Qi : sysvinit: rc: exit psplash correctly

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 70b14f1c4181d820e56e67f4a5d921905094dc62
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=70b14f1c4181d820e56e67f4a5d921905094dc62

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Wed Mar 27 16:27:25 2013 +0800

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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/sysvinit/sysvinit/rc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc
index 44bc9bf..655a0b0 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