Ignore:
Timestamp:
Jun 20, 2013 8:10:18 AM (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
0f9dbbc
Parents:
93fe45e
Message:

Fix a bug with xorg display wizard, we can skip restarting X if the user
likes the initial resolution

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-xgui/resources/scripts/xinit-autodetect

    r6f96fdf rc174ffd  
    1919fi 
    2020  
     21# We started up, let the backend script know 
    2122touch ${XGUITMP}/.xstartupsuccess 
     23 
     24# Start our fluxbox WM 
    2225/usr/local/bin/startfluxbox & 
    2326PID=$! 
     27 
     28# Ask user if they like the auto-detected resolution 
    2429/usr/local/bin/pc-xgui -firstprompt 
    25 if [ "$?" = "0" ] ; then 
    26   echo "Canceled" > ${XGUITMP}/.canceled 
     30if [ $? -eq 0 ] ; then 
     31  # The user liked this res? Lets run the other stuff now 
     32  touch ${XGUITMP}/.selected 
     33  run_firstboot 
    2734  kill -9 ${PID} 
    2835  exit 0 
    2936fi 
     37 
     38# The user wants to setup a manual resolution 
    3039/usr/local/bin/pc-xgui 
    31 if [ "$?" = "0" ] ; then 
    32  # Run the firstboot script immediately 
    33  run_firstboot 
    34 else 
     40if [ $? -ne 0 ] ; then 
    3541 echo "Canceled" > ${XGUITMP}/.canceled 
    3642fi 
Note: See TracChangeset for help on using the changeset viewer.