2Shirt
91d8185ede
* Moved starting apps from .update_x into .start_desktop_apps * This allowed .update_x to be shown on screen during startup * Included "<Action>... Done" messages for clarity * Removed x_ok logic (didn't really work) * Replaced with a generic message that _should_ be left on screen if X fails
27 lines
799 B
Bash
27 lines
799 B
Bash
setterm -blank 0 -powerdown 0 2>/dev/null
|
|
if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then
|
|
# Connect to network and update hostname
|
|
"${HOME}/.update_network"
|
|
|
|
# Update settings if using i3
|
|
if fgrep -q "i3" /proc/cmdline; then
|
|
sed -i -r 's/#(own_window_type override)/\1/' ~/.conkyrc
|
|
sed -i -r 's/openbox-session/i3/' ~/.xinitrc
|
|
fi
|
|
|
|
# Start X or HW-diags
|
|
if ! fgrep -q "nox" /proc/cmdline; then
|
|
# Show freeze warning
|
|
echo ""
|
|
echo "NOTE: Not all GPUs/displays are supported."
|
|
echo " If the system is frozen on this screen"
|
|
echo " please restart and try CLI mode instead"
|
|
echo ""
|
|
|
|
# Start x
|
|
echo "Starting X..."
|
|
startx >/dev/null 2>&1
|
|
else
|
|
hw-diags --cli
|
|
fi
|
|
fi
|