[PC-BSD Commits] r18936 - in pcbsd/current/src-qt4/pc-xgui/resources: bin cardDetect templates/header
svn at pcbsd.org
svn at pcbsd.org
Fri Sep 7 11:22:21 PDT 2012
Author: kris
Date: 2012-09-07 18:22:21 +0000 (Fri, 07 Sep 2012)
New Revision: 18936
Modified:
pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.compat
pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.default
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati-3d-enable.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel-3d-enable.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/mga-3d-enable.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/nvidia.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/radeon-3d-enable.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vboxvideo.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vmware.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vmwlegacy.xorg.conf
pcbsd/current/src-qt4/pc-xgui/resources/templates/header/xorg.conf.generic
Log:
Add the lines:
Option "AutoAddDevices" "false"
Option "AllowEmptyInput" "off"
To all xorg.conf files by default. Still fixes issues with PS2 mice and others
Modified: pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/bin/rundetect.sh 2012-09-07 18:22:21 UTC (rev 18936)
@@ -121,8 +121,14 @@
sleep 1
HOME="/root" ; export HOME
X -configure >/dev/null 2>&1
- # 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
+
AUTORES="YES"
# Use nvidia driver
sed -i '' 's|"nv"|"nvidia"|g' /etc/X11/xorg.conf
@@ -134,6 +140,13 @@
X -configure >/dev/null 2>&1
# 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 "Detected settings failed... Using failsafe VESA 1024x768 mode..." >/dev/console
Modified: pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.compat
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.compat 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.compat 2012-09-07 18:22:21 UTC (rev 18936)
@@ -3,6 +3,8 @@
Section "ServerLayout"
Identifier "XFree86 Configured"
Screen 0 "Screen0" 0 0
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.default
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.default 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.default 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
EndSection
Section "Files"
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati-3d-enable.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati-3d-enable.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati-3d-enable.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
Option "AIGLX" "true"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel-3d-enable.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel-3d-enable.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel-3d-enable.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
Option "AIGLX" "true"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/mga-3d-enable.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/mga-3d-enable.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/mga-3d-enable.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/nvidia.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/nvidia.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/nvidia.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
EndSection
Section "Files"
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/radeon-3d-enable.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/radeon-3d-enable.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/radeon-3d-enable.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vboxvideo.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vboxvideo.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vboxvideo.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vmware.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vmware.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vmware.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vmwlegacy.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vmwlegacy.xorg.conf 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/vmwlegacy.xorg.conf 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
EndSection
Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/xorg.conf.generic
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/xorg.conf.generic 2012-09-07 16:15:48 UTC (rev 18935)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/xorg.conf.generic 2012-09-07 18:22:21 UTC (rev 18936)
@@ -5,6 +5,8 @@
Screen 0 "Screen0" 0 0
InputDevice "Mouse0" "CorePointer"
InputDevice "Keyboard0" "CoreKeyboard"
+ Option "AutoAddDevices" "false"
+ Option "AllowEmptyInput" "off"
Option "Clone" "off"
EndSection
More information about the Commits
mailing list