summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjakub <jakub>1999-10-25 16:08:42 +0000
committerjakub <jakub>1999-10-25 16:08:42 +0000
commit63fc1527600eff543fd194bdb02bb82a1fa23579 (patch)
tree0a298acd512f705b8a2ecd656bc0375d275d104d
parent359a9b1ebaf39e0a8a48c1cdb6c9dd2b137646f9 (diff)
downloadanaconda-63fc1527600eff543fd194bdb02bb82a1fa23579.tar.gz
anaconda-63fc1527600eff543fd194bdb02bb82a1fa23579.tar.xz
anaconda-63fc1527600eff543fd194bdb02bb82a1fa23579.zip
Play safe and never make 1920x1200 a default resolution, plus allow it to be
chosen on Sun 24-inch only for now. For 6.2 this can be removed, but now I don't want to touch much. Run mkinitrd with --ifneeded.
-rw-r--r--todo.py1
-rw-r--r--xf86config.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/todo.py b/todo.py
index 6db0c70de..44410911c 100644
--- a/todo.py
+++ b/todo.py
@@ -706,6 +706,7 @@ class ToDo:
if not self.initrdsMade.has_key(initrd):
iutil.execWithRedirect("/sbin/mkinitrd",
[ "/sbin/mkinitrd",
+ "--ifneeded",
initrd,
kernelTag[1:] ],
stdout = None, stderr = None, searchPath = 1,
diff --git a/xf86config.py b/xf86config.py
index 9cce4ceb1..4a96b1009 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -78,7 +78,7 @@ class XF86Config:
if not self.vidRam:
return
if string.atoi(self.vidRam) >= 4096:
- self.modes["8"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1600x1200", "1920x1200"]
+ self.modes["8"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1600x1200"]
self.modes["16"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1600x1200"]
self.modes["32"] = ["640x480", "800x600", "1024x768", "1152x864"]
elif string.atoi(self.vidRam) >= 2048: