Skip to contentSkip to conversation

rc: exit psplash correctly

PATCH New [email protected] 1 participant 2 messages Mar 27, 2013

lore
Share & tools
lore
#0 lore raw

cover rc: exit psplash correctly

From: Chen Qi <[email protected]>

The following changes since commit 3c5f4d54d01887a117bf659fc9af6b2b892c2b08:

separatebuilddir.inc: mxsldr should never have been added to this list, remove (2013-03-24 14:03:19 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/psplash
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/psplash

Chen Qi (1):
rc: exit psplash correctly

 meta/recipes-core/sysvinit/sysvinit/rc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 rc: exit psplash correctly

From: Chen Qi <[email protected]>

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]

---
 meta/recipes-core/sysvinit/sysvinit/rc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/sysvinit/sysvinit/rc +1 -1
index 44bc9bf..655a0b0 100755
@@ -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
Signature · 1 line
1.7.9.5