diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2013-03-27 16:27:25 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-27 11:02:58 +0000 |
| commit | 70b14f1c4181d820e56e67f4a5d921905094dc62 (patch) | |
| tree | 1f2d7d4e4ac7bcda157ec55e8a086045b45cd0ad /meta/recipes-core/sysvinit | |
| parent | 14878f34645f5e9a63d3c3be6d6fe558bbda9900 (diff) | |
| download | openembedded-core-contrib-70b14f1c4181d820e56e67f4a5d921905094dc62.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]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit')
| -rwxr-xr-x | 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 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 |