handle framebuffer and vga16 casesbefore.bootloader.merge

3 files changed, 22 insertions, 17 deletions

diff --git a/videocard.py b/videocard.py
index 34887b9b0..5d66a1b79 100644
--- a/videocard.py
+++ b/videocard.py
@@ -32,6 +32,8 @@ Videocard_blacklist = ["Generic VGA compatible",
 
 Video_cardslist = {}
 
+USE_XFREE86_V4_FB = 0
+
 def Video_cardsDBLookup(thecard):
     card = Video_cardslist[thecard]
 
@@ -169,26 +171,21 @@ class FrameBufferCard(VideoCard):
         card = {}
 
 # This makes it use the XFree86 4.x fbdev
-# also uncomment the code below in getXServer()
-#        card["DRIVER"] = "fbdev"
-#
-# This makes is use the XFree 3.x.x fbdev
-# also uncomment the code below in getXServer()
-        card["SERVER"] = "FBDev"
+        if USE_XFREE86_V4_FB:
+	    card["DRIVER"] = "fbdev"
+	else:
+	    card["SERVER"] = "FBDev"
          
         card["NAME"] = "VGA VESA Framebuffer"
 
         return card
 
     def getXServer(self):
-        
-# This makes it use the XFree86 4.x fbdev        
-# also uncomment the code above in getCardData()
-#        return "XFree86"
-#
-# This makes is use the XFree 3.x.x fbdev
-# also uncomment the code above in getCardData()
-         return "XF86_FBDev"
+
+	if USE_XFREE86_V4_FB:
+	    return "XFree86"
+	else:
+	    return "XF86_FBDev"
 
     def isFrameBuffer(self):
         return 1
diff --git a/xf86config.py b/xf86config.py
index 581a64786..da1f41b25 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -982,7 +982,7 @@ class XF86Config:
         # restore manualmodes
         self.manualModes = manmodes
         serverPath = "/usr/X11R6/bin/" + servername
-        
+
         serverpid = os.fork()
 
         if (not serverpid):
@@ -1196,8 +1196,15 @@ Section "Screen"
                 Modes       """ % depth
 
 	    # put in all modes up to selected mode
-	    tmpmodes = self.availableModes()[depth]
-	    tmpmodes.reverse()
+	    availmodes = self.availableModes()
+	    if depth in availmodes.keys():
+		tmpmodes = availmodes[depth]
+		tmpmodes.reverse()
+	    else:
+		tmpmodes = []
+		for d in xmodes.keys():
+		    for r in xmodes[d]:
+			tmpmodes.append(r)
 
             modes = xmodes[depth]
             modes.sort (self.areaCompare)
diff --git a/xserver.py b/xserver.py
index 5a7e1f27f..336ed04b5 100644
--- a/xserver.py
+++ b/xserver.py
@@ -114,6 +114,7 @@ def startX(resolution, nofbmode, video, monitor, mouse):
         elif attempt == 'VGA16':
             # if no xserver then try falling back to VGA16 in no fb
             card = VGA16Card()
+            
             print _("Attempting to start VGA16 X server")
             next_attempt = 'END'
         else: