diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | anaconda | 8 | ||||
| -rw-r--r-- | xsetup.py | 12 |
3 files changed, 17 insertions, 9 deletions
@@ -1,9 +1,15 @@ 2007-02-01 Chris Lumens <clumens@redhat.com> + * anaconda: Pass the class to xsetup. + * installclass.py (BaseInstallClass.setMiscXSettings): Don't try to second guess any provided resolution or depth (like from a kickstart file). + * xsetup.py (XSetup.write): If a resolution was specified in a + kickstart file, preserve that in the installed system's xorg.conf + (#158089). + * yuminstall.py (YumBackend.writePackagesKS): Do a better job about writing out which packages are selected/deselected (#189873). @@ -897,13 +897,7 @@ if __name__ == "__main__": xserver.hwstate = None if xserver.hwstate is not None: - xsetup = xsetup.XSetup(xserver) - - # HACK - if user overrides resolution then use it and disable - # choosing a sane default for them - if runres_override: - xsetup.imposed_sane_default = 1 - + xsetup = xsetup.XSetup(xserver, anaconda) anaconda.id.setXSetup(xsetup) anaconda.id.setDisplayMode(opts.display_mode) @@ -21,15 +21,23 @@ import rhpl from rhpl.translate import _ class XSetup: - def __init__(self, xserver): + def __init__(self, xserver, anaconda): self.skipx = 0 - self.imposed_sane_default = 0 self.xserver = xserver + self.anaconda = anaconda def write(self, fn, mouse, keyboard): self.xserver.keyboard = keyboard self.xserver.mousehw = mouse self.xserver.generateConfig() + + res = self.anaconda.id.ksdata.xconfig.resolution + + if self.anaconda.isKickstart and res: + import xf86config + screen = xf86config.getPrimaryScreen(self.xserver.config) + screen.display[0].modes.insert(xf86config.XF86Mode(res)) + self.xserver.writeConfig(filename=fn+"/xorg.conf") def writeKS(self, f, desktop, ksconfig): |