[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r1810 - branches/debconf-overhaul/debian



Author: fabbione
Date: 2004-09-13 01:28:59 -0500 (Mon, 13 Sep 2004)
New Revision: 1810

Modified:
   branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Make fb_type detection more flexible.
Test case reported: fb_type=OFfb NVDA,NVMac would set the use of fb to true.
Hardware: ppc with nvidia gfx.


Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in	2004-09-13 06:18:48 UTC (rev 1809)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in	2004-09-13 06:28:59 UTC (rev 1810)
@@ -953,16 +953,13 @@
       # did we actually get back anything?
       if [ -n "$fb_type" ]; then
         set_db_priority "medium"
-        case "$fb_type" in
-          OFfb|VESA)
-            trace "$func(): this framebuffer type does not support UseFBDev"
-            default_use_fbdev=false
-            ;;
-          *)
-            # other framebuffers do support UseFBDev
-            default_use_fbdev=true
-            ;;
-        esac
+        if echo "$fb_type" | grep -Eiq '(OFfb|VESA)'; then
+          trace "$func(): this framebuffer type does not support UseFBDev"
+          default_use_fbdev=false
+        else 
+          # other framebuffers do support UseFBDev
+          default_use_fbdev=true
+        fi
       fi
     else
       trace "$func(): /proc/fb does not exist; assuming fbcon not in use"



Reply to: