summaryrefslogtreecommitdiffstats
path: root/xf86config.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-09-09 16:34:48 +0000
committerJeremy Katz <katzj@redhat.com>2002-09-09 16:34:48 +0000
commit8980dc588ed8af76e7d8d5456bf47a1577b7b079 (patch)
treee00d62f7d00abe973ccdc8ef9786315eac6e35bb /xf86config.py
parent4b4925ef0b47fc7d4e6d95fc3a098810b4f4bcb8 (diff)
downloadanaconda-8980dc588ed8af76e7d8d5456bf47a1577b7b079.tar.gz
anaconda-8980dc588ed8af76e7d8d5456bf47a1577b7b079.tar.xz
anaconda-8980dc588ed8af76e7d8d5456bf47a1577b7b079.zip
merge ia64 changes to HEAD
Diffstat (limited to 'xf86config.py')
-rw-r--r--xf86config.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/xf86config.py b/xf86config.py
index 2377df355..05f53a12f 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -640,6 +640,12 @@ class XF86Config:
# see if 16 bpp is available, and if it should be the
# default depth
+ # HACK: if we have nodri in the Cards file, let's make sure it
+ # really gets disabled since all of the drivers in X don't
+ # seem to listen :(
+ if string.find(cardoptions, 'Option "nodri"') != -1:
+ data["driMod"] = '\n#\tLoad "dri"',
+
if self.keyboard["variant"]:
data["enableVariant"] = ""
if self.keyboard["options"]: