[PC-BSD Commits] r21482 - pcbsd/current/src-qt4/pc-xgui/resources/bin

[svn at pcbsd.org]

Author: kris
Date: 2013-02-13 21:41:54 +0000 (Wed, 13 Feb 2013)
New Revision: 21482

Modified:
   pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
Log:

Fix some bugs running the initial display wizard after installation,
we don't need to restart gdm any more.

Also remove some old AllowEmptyInput cruft



Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2013-02-13 17:59:52 UTC (rev 21481)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh	2013-02-13 21:41:54 UTC (rev 21482)
@@ -126,12 +126,6 @@
       X -configure >/dev/null 2>&1
       cp /root/xorg.conf.new /etc/X11/xorg.conf
 
-      # Insert the AutoAddDevices / AllowEmptyInput lines
-      sed -i '' '/"CoreKeyboard"/ a\
-     Option         "AutoAddDevices" "false" \
-     Option         "AllowEmptyInput" "off" \
-' /etc/X11/xorg.conf
-
       AUTORES="YES"
       # Use nvidia driver
       sed -i '' 's|"nv"|"nvidia"|g' /etc/X11/xorg.conf
@@ -145,12 +139,6 @@
     # Copy over the new xorg.conf
     cp /root/xorg.conf.new /etc/X11/xorg.conf
 
-    # Insert the AutoAddDevices / AllowEmptyInput lines
-    sed -i '' '/"CoreKeyboard"/ a\
-     Option         "AutoAddDevices" "false" \
-     Option         "AllowEmptyInput" "off" \
-' /etc/X11/xorg.conf
-
   else
     # Still failed, drop to VESA failsafe
     echo "`clear`" >/dev/console
@@ -159,9 +147,6 @@
     cp ${PROGDIR}/cardDetect/XF86Config.compat /etc/X11/xorg.conf
   fi
 
-  # Setup touch-screen support
-  ${PROGDIR}/bin/setuptouch.sh /etc/X11/xorg.conf
-
   # Check if the previous attempt failed
   if [ -e "${XGUITMP}/.failed" ]
   then
@@ -228,13 +213,6 @@
 done
 
 
-# Make sure gdm is enabled
-cat /etc/rc.conf | grep 'gdm_enable' >/dev/null 2>/dev/null
-if [ "$?" != "0" ] ; then
-	echo 'gdm_enable="YES"' >>/etc/rc.conf
-	/usr/local/etc/rc.d/gdm start &
-fi
-
 rm /root/.xinitrc >/dev/null 2>/dev/null
 # Check if we need to save an existing .xinitrc file
 if [ -e "/root/.xinitrc.xbak" ] ; then