2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Fallback to HW-Diags CLI if X fails to start

Browse source 
* Fixes issue #74
This commit is contained in:
2Shirt 2018-12-19 18:45:58 -07:00
parent 42407f0eca
commit f022d0ca76
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.linux_items/include/airootfs/etc/skel/.update_x
View file

@ -92,3 +92,6 @@ else
cbatticon --hide-notification & cbatticon --hide-notification &
fi fi
# Prevent Xorg from being killed by .zlogin
touch "/tmp/x_ok"

11
.linux_items/include/airootfs/etc/skel/.zlogin
View file

@ -14,7 +14,18 @@ if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then
# Start X or HW-diags # Start X or HW-diags
if ! fgrep -q "nox" /proc/cmdline; then if ! fgrep -q "nox" /proc/cmdline; then
# Kill Xorg after 30 seconds if it doesn't fully initialize
(sleep 30s; if ! [[ -f "/tmp/x_ok" ]]; then pkill '(Xorg|startx)'; fi) &
# Try starting X
startx >/dev/null startx >/dev/null
# Run Hw-Diags CLI if necessary
if ! [[ -f "/tmp/x_ok" ]]; then
echo "There was an issue starting Xorg, starting CLI interface..."
sleep 2s
hw-diags cli
fi
else else
hw-diags cli hw-diags cli
fi fi