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

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



Author: fabbione
Date: 2004-09-14 01:33:43 -0500 (Tue, 14 Sep 2004)
New Revision: 1813

Modified:
   branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Set amd64 default to false.
Remove empty default_use_fbdev= line to not reset the $ARCH default.
Add safe default_use_fbdev=false if there is no /proc/fb.
Add safe default_use_fbdev=false if there is no /proc at all.


Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in	2004-09-13 19:10:51 UTC (rev 1812)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in	2004-09-14 06:33:43 UTC (rev 1813)
@@ -936,7 +936,7 @@
   # Use fbcon kernel interface?
   set_db_priority "high"
   case "$ARCH" in
-    alpha|hurd-i386|i386)
+    alpha|hurd-i386|i386|amd64)
       default_use_fbdev=false
       ;;
     *)
@@ -944,7 +944,6 @@
       ;;
   esac
 
-  default_use_fbdev=
   # XXX: is this a good test for /proc being mounted?
   if [ -e /proc/self ]; then
     if [ -e /proc/fb ]; then
@@ -963,9 +962,11 @@
       fi
     else
       trace "$func(): /proc/fb does not exist; assuming fbcon not in use"
+      default_use_fbdev=false
     fi
   else
     trace "$func(): /proc not mounted; cannot determine if fbcon in use"
+    default_use_fbdev=false
   fi
 
   # re-set the default answer to false if need be



Reply to: