[Fai-commit] r4422 - trunk/examples/simple/class

[lange at alioth.debian.org]

Author: lange
Date: 2007-07-09 14:32:39 +0000 (Mon, 09 Jul 2007)
New Revision: 4422

Modified:
   trunk/examples/simple/class/20-hwdetect.source
Log:
xorg can discover the grpahics driver itself, do not call discover


Modified: trunk/examples/simple/class/20-hwdetect.source
===================================================================
--- trunk/examples/simple/class/20-hwdetect.source	2007-07-09 07:24:31 UTC (rev 4421)
+++ trunk/examples/simple/class/20-hwdetect.source	2007-07-09 14:32:39 UTC (rev 4422)
@@ -36,7 +36,7 @@
 done
 
 # let discover do most of the job
-[ -x /sbin/discover-modprobe ] && /sbin/discover-modprobe
+#[ -x /sbin/discover-modprobe ] && /sbin/discover-modprobe
 
 # now we can mount the USB filesystem
 mount -t usbfs  usbfs /proc/bus/usb
@@ -45,18 +45,6 @@
 
 echo 6 > /proc/sys/kernel/printk
 
-# try to detect graphics card
-# the variable VIDEODRIVER may be used to generate the xorg.conf file
-[ -x "$(which discover)" ] && {
-    if discover --version | grep "discover \(version \)*1\." ; then
-	VIDEODRIVER=$(discover --xdriver video 2> /dev/null)
-    else
-	VIDEODRIVER=$(discover --data-path=xfree86/server/device/driver display)
-    fi
-    [ -n "$VIDEODRIVER" ] && echo "VIDEODRIVER=$VIDEODRIVER" >> $LOGDIR/additional.var
-    echo "Video card detected: $VIDEODRIVER"
-}
-
 set_disk_info  # calculate number of available disks
 save_dmesg     # save new boot messages (from loading modules)