[PC-BSD Commits] r21483 - in pcbsd/current: overlays/install-overlay/root overlays/install-overlay/root/cardDetect src-qt4/pc-xgui/resources/bin src-qt4/port-files src-sh/pc-thinclient/resources/scripts

[svn at pcbsd.org]

Author: kris
Date: 2013-02-13 21:46:36 +0000 (Wed, 13 Feb 2013)
New Revision: 21483

Removed:
   pcbsd/current/src-qt4/pc-xgui/resources/bin/setuptouch.sh
Modified:
   pcbsd/current/overlays/install-overlay/root/cardDetect/x_config.sh
   pcbsd/current/overlays/install-overlay/root/functions.sh
   pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh
   pcbsd/current/src-qt4/port-files/pkg-plist
   pcbsd/current/src-sh/pc-thinclient/resources/scripts/tcslogin.sh
Log:

Remove a bunch of old setuptouch.sh and AllowEmptyInput references



Modified: pcbsd/current/overlays/install-overlay/root/cardDetect/x_config.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/root/cardDetect/x_config.sh	2013-02-13 21:41:54 UTC (rev 21482)
+++ pcbsd/current/overlays/install-overlay/root/cardDetect/x_config.sh	2013-02-13 21:46:36 UTC (rev 21483)
@@ -129,9 +129,6 @@
 ;;
 esac
 
-# Check if we can enable any touch-screen drivers
-/root/cardDetect/setuptouch.sh "${XFREE_TMPCONF}"
-
 cp $XFREE_TMPCONF $XFREE_CONF
 printf "$X_MON\n\n" >> $XFREE_CONF
 printf "$X_DEV\n\n" >> $XFREE_CONF

Modified: pcbsd/current/overlays/install-overlay/root/functions.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/root/functions.sh	2013-02-13 21:41:54 UTC (rev 21482)
+++ pcbsd/current/overlays/install-overlay/root/functions.sh	2013-02-13 21:46:36 UTC (rev 21483)
@@ -13,7 +13,6 @@
   # If we are starting in VESA only mode
   if [ "$xvesa" = "YES" ]; then
     cp /root/cardDetect/XF86Config.compat /etc/X11/xorg.conf
-    #/root/cardDetect/setuptouch.sh /etc/X11/xorg.conf
     return
   fi
 
@@ -27,12 +26,6 @@
   # Use nvidia driver
   sed -i '' 's|"nv"|"nvidia"|g' /etc/X11/xorg.conf
 
-  # Insert the AutoAddDevices / AllowEmptyInput lines
-  sed -i '' '/"CoreKeyboard"/ a\
-     Option         "AutoAddDevices" "false" \
-     Option         "AllowEmptyInput" "off" \
-' /etc/X11/xorg.conf
-  #/root/cardDetect/setuptouch.sh /etc/X11/xorg.conf
 }
 
 start_xorg()
@@ -48,26 +41,17 @@
     # 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
-
-    #/root/cardDetect/setuptouch.sh /etc/X11/xorg.conf
     startx
     if [ ! -e "/tmp/.xstarted" ]
     then
       echo "ERROR: Failed to start X in SAFE mode... Trying VESA mode..."
       rm /etc/X11/xorg.conf
       cp /root/cardDetect/XF86Config.compat /etc/X11/xorg.conf
-      #/root/cardDetect/setuptouch.sh /etc/X11/xorg.conf
       startx
      if [ ! -e "/tmp/.xstarted" ]
       then
         # Try the Intel driver, since nvidia/vesa will fail on optimus cards
         cp /root/cardDetect/XF86Config.intel /etc/X11/xorg.conf
-        #/root/cardDetect/setuptouch.sh /etc/X11/xorg.conf
         startx
         if [ ! -e "/tmp/.xstarted" ]
         then

Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh	2013-02-13 21:41:54 UTC (rev 21482)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/setupconf.sh	2013-02-13 21:46:36 UTC (rev 21483)
@@ -121,16 +121,12 @@
   then
      echo 'Section "ServerFlags"
     Option         "Xinerama" "0"
-    Option "AutoAddDevices" "False"
-    Option "AllowEmptyInput" "Off"
 EndSection
 
 ' >> ${TMPFILE}
   else
      echo 'Section "ServerFlags"
     Option         "Xinerama" "1"
-    Option "AutoAddDevices" "False"
-    Option "AllowEmptyInput" "Off"
 EndSection
 
 ' >> ${TMPFILE}
@@ -251,12 +247,7 @@
 done # End of while loop for the Screen device
 
 ##############################################################################
-# Check for any touch-screen devices
 
-${PROGDIR}/bin/setuptouch.sh "$TMPFILE"
-
-##############################################################################
-
 mv $TMPFILE /etc/X11/xorg.conf
 
 # Done generating the xorg.conf file

Modified: pcbsd/current/src-qt4/port-files/pkg-plist
===================================================================
--- pcbsd/current/src-qt4/port-files/pkg-plist	2013-02-13 21:41:54 UTC (rev 21482)
+++ pcbsd/current/src-qt4/port-files/pkg-plist	2013-02-13 21:46:36 UTC (rev 21483)
@@ -335,7 +335,6 @@
 share/pcbsd/xorg-gui/scripts/xinit-failed
 share/pcbsd/xorg-gui/bin/rundetect.sh
 share/pcbsd/xorg-gui/bin/setupconf.sh
-share/pcbsd/xorg-gui/bin/setuptouch.sh
 share/pcbsd/pc-systemupdatertray/images/autoupdateinstalling.png
 share/pcbsd/pc-systemupdatertray/images/autoupdateready.png
 share/pcbsd/pc-systemupdatertray/images/connecterror.png

Modified: pcbsd/current/src-sh/pc-thinclient/resources/scripts/tcslogin.sh
===================================================================
--- pcbsd/current/src-sh/pc-thinclient/resources/scripts/tcslogin.sh	2013-02-13 21:41:54 UTC (rev 21482)
+++ pcbsd/current/src-sh/pc-thinclient/resources/scripts/tcslogin.sh	2013-02-13 21:46:36 UTC (rev 21483)
@@ -64,12 +64,6 @@
               read tmp
               ;;
         auto) X -configure
-echo 'Section "ServerFlags"
-        Option "DisableVidModeExtension" "True"
-        Option "AutoAddDevices" "False"
-        Option "AllowEmptyInput" "Off"
-EndSection
-' >/etc/X11/xorg.conf
               cat /root/xorg.conf.new >> /etc/X11/xorg.conf
               clear
               echo "Copied Xorg auto-detected config."