diff options
| author | jakub <jakub> | 1999-10-15 14:58:44 +0000 |
|---|---|---|
| committer | jakub <jakub> | 1999-10-15 14:58:44 +0000 |
| commit | 03499a88d17aec4347e916058174b0602dc036f2 (patch) | |
| tree | 65c3b431aab4f9a76ab69cd17a07f386e549fafe /xf86config.py | |
| parent | 23ba9d96a7829bd534c5bbb411f7a9a9d0ead1b0 (diff) | |
| download | anaconda-03499a88d17aec4347e916058174b0602dc036f2.tar.gz anaconda-03499a88d17aec4347e916058174b0602dc036f2.tar.xz anaconda-03499a88d17aec4347e916058174b0602dc036f2.zip | |
Don't always assume first probed card should be primary one.
E.g. I have a Matrox Millenium II found before Mach64, but console is really
on Mach64. Highest priority gets first card with device set, if there is no
such one, then first card.
Diffstat (limited to 'xf86config.py')
| -rw-r--r-- | xf86config.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/xf86config.py b/xf86config.py index 217b0ebd4..2edec311b 100644 --- a/xf86config.py +++ b/xf86config.py @@ -28,6 +28,7 @@ class XF86Config: self.devID = None self.probed = 0 self.skip = 0 + self.primary = 0 self.modes = { "8" : ["640x480"] } self.device = None self.keyRules = "xfree86" @@ -157,13 +158,15 @@ class XF86Config: self.vidCards.append (card) if self.vidCards: - self.devID = self.vidCards[0]["NAME"] - self.server = self.vidCards[0]["SERVER"] + self.devID = self.vidCards[self.primary]["NAME"] + self.server = self.vidCards[self.primary]["SERVER"] def probe (self, probeMonitor = 1): if self.probed: return self.probed = 1 + self.device = None + self.primary = 0 # PCI probe for video cards sections = {} @@ -173,8 +176,9 @@ class XF86Config: for card in cards: section = "" (device, server, descr) = card - if len (self.vidCards) == 0: + if device and not self.device: self.device = device + self.primary = len(self.vidCards) if len (server) > 5 and server[0:5] == "Card:": self.vidCards.append (self.cards (server[5:])) if len (server) > 7 and server[0:7] == "Server:": @@ -183,8 +187,8 @@ class XF86Config: self.vidCards.append (info) if self.vidCards: - self.devID = self.vidCards[0]["NAME"] - self.server = self.vidCards[0]["SERVER"] + self.devID = self.vidCards[self.primary]["NAME"] + self.server = self.vidCards[self.primary]["SERVER"] # VESA probe for monitor/videoram, etc. if probeMonitor: @@ -213,7 +217,7 @@ class XF86Config: self.monVert = string.strip (string.split (ranges[1], '=')[1]) if self.vidCards and self.cardMan: - self.vidCards[0]["VENDOR"] = self.cardMan + self.vidCards[self.primary]["VENDOR"] = self.cardMan except: pass if not self.vidRam and self.device: @@ -228,7 +232,7 @@ class XF86Config: def probeReport (self): probe = "" if self.vidCards: - probe = probe + _("Video Card") + ": " + self.vidCards[0]["NAME"] + "\n" + probe = probe + _("Video Card") + ": " + self.vidCards[self.primary]["NAME"] + "\n" if self.vidRam: probe = probe + "\t" + _("Video Ram") + ": " + self.vidRam + " kb\n" if self.server: |