Patchwork [1/1] xserver-nodm: change start runlevel from 2 5 to 2 3 4 5

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date March 26, 2013, 7:18 a.m.
Message ID <6eeac889db624cc56bbf8c569e686e717f0ae9e6.1364281933.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/46905/
State New
Headers show

Comments

Qi.Chen@windriver.com - March 26, 2013, 7:18 a.m.
From: Chen Qi <Qi.Chen@windriver.com>

This script is intended to start at runlevel 2 3 4 5, as specified
in its HEAD INFO area.

The fact that it was not started at runlevel 3 caused splash screen
not going away when booting into runlevel 3.

[YOCTO #3904]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../x11-common/xserver-nodm-init.bb                |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Richard Purdie - March 26, 2013, 11:11 p.m.
On Tue, 2013-03-26 at 15:18 +0800, Qi.Chen@windriver.com wrote:
> From: Chen Qi <Qi.Chen@windriver.com>
> 
> This script is intended to start at runlevel 2 3 4 5, as specified
> in its HEAD INFO area.

Perhaps the header is wrong?

> The fact that it was not started at runlevel 3 caused splash screen
> not going away when booting into runlevel 3.

I thought psplash was meant to timeout and switch to the console, or
switch there at boot completion anyway. I suspect the bug is somewhere
else.

Cheers,

Richard

> [YOCTO #3904]
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  .../x11-common/xserver-nodm-init.bb                |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> index eab76c5..9faeb99 100644
> --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> @@ -26,7 +26,7 @@ do_install() {
>  inherit update-rc.d useradd
>  
>  INITSCRIPT_NAME = "xserver-nodm"
> -INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> +INITSCRIPT_PARAMS = "start 9 2 3 4 5 . stop 20 0 1 6 ."
>  
>  # Use fixed Xusername of xuser for now, this will need to be
>  # fixed if the Xusername changes from xuser
Qi.Chen@windriver.com - March 27, 2013, 8:27 a.m.
On 03/27/2013 07:11 AM, Richard Purdie wrote:
> On Tue, 2013-03-26 at 15:18 +0800, Qi.Chen@windriver.com wrote:
>> From: Chen Qi <Qi.Chen@windriver.com>
>>
>> This script is intended to start at runlevel 2 3 4 5, as specified
>> in its HEAD INFO area.
> Perhaps the header is wrong?
>
>> The fact that it was not started at runlevel 3 caused splash screen
>> not going away when booting into runlevel 3.
> I thought psplash was meant to timeout and switch to the console, or
> switch there at boot completion anyway. I suspect the bug is somewhere
> else.
>
> Cheers,
>
> Richard

Thank you for reminding me of this.
I've sent another patch to fix this problem.

The root cause is in the rc script.

#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 type psplash-write >/dev/null 2>&1; then
         TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
         umount /mnt/.psplash
     fi
fi

So psplash doesn't exit even when xserver-nodm is not started, for 
example, at runlevel 3.

I changed it to:
/*if [ "x$runlevel" != "xS" ] && [ ! -x 
/etc/rc${runlevel}.d/S??xserver-nodm ]; then*/

Best Regards,
Chen Qi
>> [YOCTO #3904]
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>>   .../x11-common/xserver-nodm-init.bb                |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
>> index eab76c5..9faeb99 100644
>> --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
>> +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
>> @@ -26,7 +26,7 @@ do_install() {
>>   inherit update-rc.d useradd
>>   
>>   INITSCRIPT_NAME = "xserver-nodm"
>> -INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
>> +INITSCRIPT_PARAMS = "start 9 2 3 4 5 . stop 20 0 1 6 ."
>>   
>>   # Use fixed Xusername of xuser for now, this will need to be
>>   # fixed if the Xusername changes from xuser
>
>
>

Patch

diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index eab76c5..9faeb99 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -26,7 +26,7 @@  do_install() {
 inherit update-rc.d useradd
 
 INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 9 2 3 4 5 . stop 20 0 1 6 ."
 
 # Use fixed Xusername of xuser for now, this will need to be
 # fixed if the Xusername changes from xuser