> # function to handle X startup special issues for anaconda > -def doStartupX11Actions(): > +def doStartupX11Actions(anaconda): > global wm_pid # pid of the anaconda fork where the window manager is running > > # now start up the window manager > wm_pid = startMetacityWM() > log.info("Starting window manager, pid %s." % (wm_pid,)) > > + # setup layouts > + if anaconda.ksdata.keyboard.layouts_list: > + from pyanaconda.xklavier import XklWrapper, XklWrapperError > + > + layouts = anaconda.ksdata.keyboard.layouts_list > + xklwrapper = XklWrapper.get_instance() > + > + try: > + xklwrapper.replace_layouts(layouts) > + > + except XklWrapperError as xklerr: > + msg = "Failed to activate layouts %s" % ",".join(layouts) > + log.error(msg) > + I'm trying to get rid of the practice of passing an anaconda object everywhere. doStartupX11Actions could make do with just getting keyboard data, so that's what should be passed to it. - Chris _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list