From 19eaf4a59f4545e049f525d0b0446a9c08d18f0f Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 20 May 2015 13:44:18 -0500 Subject: xserver-nodm: Support reboot from inside X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- 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 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 ;; -- cgit v1.2.3