diff options
| author |   Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2015-05-20 13:44:18 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-30 22:26:14 +0100 |
| commit | 1d0e21702324e24625e35a3c6b89df5623d4704f (patch) | |
| tree | 5167571736be8d30a66625d83b9bf5a3a9439a91 /meta/recipes-graphics/x11-common | |
| parent | 1d22b56992b6579847207b97122ad09055d0e3b0 (diff) | |
| download | openembedded-core-contrib-1d0e21702324e24625e35a3c6b89df5623d4704f.tar.gz | |
xserver-nodm: Support reboot from inside X
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.
(From OE-Core rev: 19eaf4a59f4545e049f525d0b0446a9c08d18f0f)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/x11-common')
| -rwxr-xr-x | meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 4 |
1 files 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 2e3e090777..bfa0a8d6cb 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 ;; |