Work with VConsole keymap and X layouts separately

We need to set VConsole keymap and X layouts separately. We may
get them all from kickstart, but if not, we have to convert the
given one to the missing one and save the configuration. If X11
configuration is written before the server is started, it is
loaded. This way we can get rid of using XklWrapper in main anaconda
script.

Also we need to write one more configuration file. And it's better
to try to write all configuration files ignoring errors and in case
some error(s) appeared, raise exception at the end of the procedure.

Resolves: rhbz#853877
Resolves: rhbz#856362
Resolves: rhbz#859867

1 files changed, 1 insertions, 15 deletions

diff --git a/anaconda b/anaconda
index 90fad452f..5d2ec72d5 100755
--- a/anaconda
+++ b/anaconda
@@ -580,20 +580,6 @@ def setupDisplay(anaconda, opts):
     # with X running we can initialize the UI interface
     anaconda.initInterface()
 
-    # setup layouts
-    if anaconda.displayMode == 'g' and anaconda.ksdata.keyboard.layouts_list:
-        from pyanaconda.keyboard 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)
-
     anaconda.instClass.configure(anaconda)
 
 def prompt_for_ssh():
@@ -856,7 +842,7 @@ if __name__ == "__main__":
             ksdata.keyboard.keyboard = opts.keymap
 
     if ksdata.keyboard.keyboard:
-        keyboard.activate_console_keymap(ksdata.keyboard.keyboard)
+        keyboard.activate_keyboard(ksdata.keyboard)
 
     # Some post-install parts of anaconda are implemented as kickstart
     # scripts.  Add those to the ksdata now.