diff options
| author | jakub <jakub> | 2000-06-20 09:25:22 +0000 |
|---|---|---|
| committer | jakub <jakub> | 2000-06-20 09:25:22 +0000 |
| commit | 164d9f18fb1764ed0b5f45f19e8c4a93d33b0f36 (patch) | |
| tree | 9bd436a60a21f4a8be4f74e7b5a4e789f7b325d0 /xf86config.py | |
| parent | 18faa6b74f3d4ee0188e4709b31cd810e8dec0ca (diff) | |
| download | anaconda-164d9f18fb1764ed0b5f45f19e8c4a93d33b0f36.tar.gz anaconda-164d9f18fb1764ed0b5f45f19e8c4a93d33b0f36.tar.xz anaconda-164d9f18fb1764ed0b5f45f19e8c4a93d33b0f36.zip | |
Some more SPARC hacks
Diffstat (limited to 'xf86config.py')
| -rw-r--r-- | xf86config.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/xf86config.py b/xf86config.py index 4e722d6e5..ea02086f6 100644 --- a/xf86config.py +++ b/xf86config.py @@ -442,12 +442,10 @@ EndSection Section "Module" Load "dbe" - Load "extmod" - %(nonSparcMods)s + Load "extmod"%(nonSparcMods)s Load "pex5" Load "record" - Load "xie" - %(ia64Mods)s + Load "xie"%(ia64Mods)s EndSection Section "InputDevice" @@ -816,12 +814,10 @@ class XF86Config: except: pass if not self.vidRam and self.device: - if self.server and self.server[0:3] == 'Sun': - # fbconProbe gives bogus video RAM reports on SBUS and UPA servers - return try: (vidram, depth, mode, monitor) = isys.fbconProbe("/dev/" + self.device) - self.vidRam = "%d" % vidram + if vidram: + self.vidRam = "%d" % vidram if depth: self.modes = { "%d" % depth : [ mode ] } self.monSect = monitor @@ -1029,7 +1025,10 @@ Section "Screen" screens = screens + """ EndSubsection """ - data = { "mouseProto" : self.mouse.info['XMOUSETYPE'], + mouseProto = self.mouse.info['XMOUSETYPE'] + if mouseProto == 'sun': + mouseProto = 'BusMouse' + data = { "mouseProto" : mouseProto, "mouseDevice" : self.mouse.device, "cardsOptions" : self.vidCards[self.primary].get ("LINE", @@ -1042,7 +1041,7 @@ Section "Screen" "files" : self.files, "screenModes" : screens, "ia64Mods" : "", - "nonSparcMods" : 'Load "fbdevhw"', + "nonSparcMods" : '\nLoad "fbdevhw"', "XkbRules" : self.keyRules, "XkbModel" : self.keyModel, "XkbLayout" : self.keyLayout, |