Permalink
Browse files

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

likes the initial resolution
  • Loading branch information...
1 parent 93fe45e commit c174ffd3299bd240148f5200ccbc4e5f70965fb2 @kmoore134 kmoore134 committed Jun 20, 2013
@@ -18,20 +18,26 @@ if [ -e "/etc/pcbsd-lang" ] ; then
export LANG
fi
+# We started up, let the backend script know
touch ${XGUITMP}/.xstartupsuccess
+
+# Start our fluxbox WM
/usr/local/bin/startfluxbox &
PID=$!
+
+# Ask user if they like the auto-detected resolution
/usr/local/bin/pc-xgui -firstprompt
-if [ "$?" = "0" ] ; then
- echo "Canceled" > ${XGUITMP}/.canceled
+if [ $? -eq 0 ] ; then
+ # The user liked this res? Lets run the other stuff now
+ touch ${XGUITMP}/.selected
+ run_firstboot
kill -9 ${PID}
exit 0
fi
+
+# The user wants to setup a manual resolution
/usr/local/bin/pc-xgui
-if [ "$?" = "0" ] ; then
- # Run the firstboot script immediately
- run_firstboot
-else
+if [ $? -ne 0 ] ; then
echo "Canceled" > ${XGUITMP}/.canceled
fi
kill -9 ${PID}
@@ -18,8 +18,8 @@ touch ${XGUITMP}/.xstartupsuccess
/usr/local/bin/startfluxbox &
PID=$!
/usr/local/bin/pc-xgui -test
-if [ "${?}" = "0" ]; then
- echo "selected" > ${XGUITMP}/.selected
+if [ $? -eq 0 ]; then
+ touch ${XGUITMP}/.selected
# Run the firstboot script immediately
run_firstboot

0 comments on commit c174ffd

Please sign in to comment.