[Debconf-video-commits] r660 - in fai-config: class files/etc/X11/xorg.conf package_config

[Holger Levsen]

Author: holger
Date: 2011-07-19 19:30:46 +0000 (Tue, 19 Jul 2011)
New Revision: 660

Removed:
   fai-config/files/etc/X11/xorg.conf/NVIDIA
Modified:
   fai-config/class/20-debconf11-classes
   fai-config/package_config/VIDEO
Log:
get rid of traces of nvidia, new laptops have intel gracas

Modified: fai-config/class/20-debconf11-classes
===================================================================
--- fai-config/class/20-debconf11-classes	2011-07-19 19:27:34 UTC (rev 659)
+++ fai-config/class/20-debconf11-classes	2011-07-19 19:30:46 UTC (rev 660)
@@ -37,8 +37,6 @@
 esac
 
 case $HOSTNAME in
-   selma|scratchy) 
-   		echo "NVIDIA";;
    barney) 
    		echo "PENTA";;
 esac

Deleted: fai-config/files/etc/X11/xorg.conf/NVIDIA
===================================================================
--- fai-config/files/etc/X11/xorg.conf/NVIDIA	2011-07-19 19:27:34 UTC (rev 659)
+++ fai-config/files/etc/X11/xorg.conf/NVIDIA	2011-07-19 19:30:46 UTC (rev 660)
@@ -1,51 +0,0 @@
-# xorg.conf (X.Org X Window System server configuration file)
-#
-# This file was generated by dexconf, the Debian X Configuration tool, using
-# values from the debconf database.
-#
-# Edit this file with caution, and see the xorg.conf manual page.
-# (Type "man xorg.conf" at the shell prompt.)
-#
-# This file is automatically updated on xserver-xorg package upgrades *only*
-# if it has not been modified since the last upgrade of the xserver-xorg
-# package.
-#
-# If you have edited this file but would like it to be automatically updated
-# again, run the following command:
-#   sudo dpkg-reconfigure -phigh xserver-xorg
-
-Section "InputDevice"
-	Identifier	"Generic Keyboard"
-	Driver		"kbd"
-	Option		"CoreKeyboard"
-	Option		"XkbRules"	"xorg"
-	Option		"XkbModel"	"pc105"
-EndSection
-
-Section "InputDevice"
-	Identifier	"Configured Mouse"
-	Driver		"mouse"
-EndSection
-
-Section "Device"
-	Identifier	"Configured Video Device"
-	Driver "nvidia"
-EndSection
-
-Section "Monitor"
-	Identifier	"Configured Monitor"
-EndSection
-
-Section "Screen"
-	Identifier	"Default Screen"
-	Monitor		"Configured Monitor"
-        SubSection "Display"
-                Depth     24
-#               Modes "1400x900"
-#                Virtual 3360 1200
-#                Virtual 3840 1200
-        EndSubSection
-
-EndSection
-
-

Modified: fai-config/package_config/VIDEO
===================================================================
--- fai-config/package_config/VIDEO	2011-07-19 19:27:34 UTC (rev 659)
+++ fai-config/package_config/VIDEO	2011-07-19 19:30:46 UTC (rev 660)
@@ -50,9 +50,6 @@
 PACKAGES install lisa
 fail2ban
 
-PACKAGES install NVIDIA
-linux-headers-2.6.32-5-all
-nvidia-kernel-dkms nvidia-glx
 
 #unused:
 PACKAGES install BRIDGE