summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-03-27 16:27:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-27 11:18:27 +0000
commitf9a92d9534e4fbb8d912c5e8fba8fb6e96286601 (patch)
treeaa8ae89afc480b849e8fa5b18ded7d6e8d6bfa26
parent10f40af173ec51cd6de130eb60511a9f1b444448 (diff)
downloadpoky-f9a92d9534e4fbb8d912c5e8fba8fb6e96286601.tar.gz
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] (From OE-Core rev: 70b14f1c4181d820e56e67f4a5d921905094dc62) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-core/sysvinit/sysvinit/rc2
1 files changed, 1 insertions, 1 deletions
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() {
171 fi 171 fi
172 172
173#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch 173#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch
174if [ "x$runlevel" != "xS" ] && [ ! -x /etc/init.d/xserver-nodm ]; then 174if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then
175 if type psplash-write >/dev/null 2>&1; then 175 if type psplash-write >/dev/null 2>&1; then
176 TMPDIR=/mnt/.psplash psplash-write "QUIT" || true 176 TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
177 umount /mnt/.psplash 177 umount /mnt/.psplash