[PATCHv2] xserver-nodm: Support reboot from inside X

[PATCHv2] xserver-nodm: Support reboot from inside X

[Aníbal Limón]

From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

If reboot was called from inside the Xserver there could happen a race
condition where chvt would never end, and therefore the whole system was
stalled.

The user could not recover the system by ssh the machine or using the
keyboard.

Running chvt in background fixes the issue.

Also move sleep 1s inside stop to give time for killproc xinit for
fix issue when chvt 1 don't work because X server is still running.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index 2e3e090..bfa0a8d 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
@@ -48,12 +48,12 @@ case "$1" in
   stop)
         echo "Stopping XServer"
         killproc xinit
-        chvt 1
+        sleep 1
+        chvt 1 &
   ;;
 
   restart)
 	$0 stop
-        sleep 1
         $0 start
   ;;
 
-- 
1.9.1

Re: [PATCHv2] xserver-nodm: Support reboot from inside X

[Aníbal Limón]

ping...

On 20/05/15 13:44, Aníbal Limón wrote:
> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>
> If reboot was called from inside the Xserver there could happen a race
> condition where chvt would never end, and therefore the whole system was
> stalled.
>
> The user could not recover the system by ssh the machine or using the
> keyboard.
>
> Running chvt in background fixes the issue.
>
> Also move sleep 1s inside stop to give time for killproc xinit for
> fix issue when chvt 1 don't work because X server is still running.
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
> ---
>   meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
> index 2e3e090..bfa0a8d 100755
> --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
> +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
> @@ -48,12 +48,12 @@ case "$1" in
>     stop)
>           echo "Stopping XServer"
>           killproc xinit
> -        chvt 1
> +        sleep 1
> +        chvt 1 &
>     ;;
>   
>     restart)
>   	$0 stop
> -        sleep 1
>           $0 start
>     ;;
>   

Re: [PATCHv2] xserver-nodm: Support reboot from inside X

[Ricardo Ribalda Delgado]

I tested the proposed change and works also fine.


Thanks!

On Tue, May 26, 2015 at 11:24 PM, Aníbal Limón
<anibal.limon@linux.intel.com> wrote:
> ping...
>
>
> On 20/05/15 13:44, Aníbal Limón wrote:
>>
>> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>>
>> If reboot was called from inside the Xserver there could happen a race
>> condition where chvt would never end, and therefore the whole system was
>> stalled.
>>
>> The user could not recover the system by ssh the machine or using the
>> keyboard.
>>
>> Running chvt in background fixes the issue.
>>
>> Also move sleep 1s inside stop to give time for killproc xinit for
>> fix issue when chvt 1 don't work because X server is still running.
>>
>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
>> ---
>>   meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git
>> a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
>> b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
>> index 2e3e090..bfa0a8d 100755
>> --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
>> +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
>> @@ -48,12 +48,12 @@ case "$1" in
>>     stop)
>>           echo "Stopping XServer"
>>           killproc xinit
>> -        chvt 1
>> +        sleep 1
>> +        chvt 1 &
>>     ;;
>>       restart)
>>         $0 stop
>> -        sleep 1
>>           $0 start
>>     ;;
>>
>
>



-- 
Ricardo Ribalda