[PC-BSD Commits] r18937 - in pcbsd/current/overlays/install-overlay/root: . cardDetect

[svn at pcbsd.org]

Author: kris
Date: 2012-09-07 18:26:15 +0000 (Fri, 07 Sep 2012)
New Revision: 18937

Modified:
   pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.compat
   pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.default
   pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.intel
   pcbsd/current/overlays/install-overlay/root/functions.sh
Log:

Also add fixed xorg lines during installation



Modified: pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.compat
===================================================================
--- pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.compat	2012-09-07 18:22:21 UTC (rev 18936)
+++ pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.compat	2012-09-07 18:26:15 UTC (rev 18937)
@@ -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/overlays/install-overlay/root/cardDetect/XF86Config.default
===================================================================
--- pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.default	2012-09-07 18:22:21 UTC (rev 18936)
+++ pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.default	2012-09-07 18:26:15 UTC (rev 18937)
@@ -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/overlays/install-overlay/root/cardDetect/XF86Config.intel
===================================================================
--- pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.intel	2012-09-07 18:22:21 UTC (rev 18936)
+++ pcbsd/current/overlays/install-overlay/root/cardDetect/XF86Config.intel	2012-09-07 18:26:15 UTC (rev 18937)
@@ -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/overlays/install-overlay/root/functions.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/root/functions.sh	2012-09-07 18:22:21 UTC (rev 18936)
+++ pcbsd/current/overlays/install-overlay/root/functions.sh	2012-09-07 18:26:15 UTC (rev 18937)
@@ -26,6 +26,12 @@
   cp /root/xorg.conf.new /etc/X11/xorg.conf
   # 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
 }
 
@@ -41,6 +47,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
+
     #/root/cardDetect/setuptouch.sh /etc/X11/xorg.conf
     startx
     if [ ! -e "/tmp/.xstarted" ]