Move keyboard to the Anaconda object.

9 files changed, 27 insertions, 28 deletions

diff --git a/anaconda b/anaconda
index e71a3ddb1..9e11ed3a5 100755
--- a/anaconda
+++ b/anaconda
@@ -448,6 +448,7 @@ class Anaconda(object):
         self._instLanguage = None
         self._intf = None
         self.isHeadless = False
+        self.keyboard = keyboard.Keyboard()
         self.ksdata = None
         self.mediaDevice = None
         self.methodstr = None
@@ -613,6 +614,8 @@ class Anaconda(object):
                                        [svc, "on"],
                                        stdout="/dev/tty5", stderr="/dev/tty5",
                                        root=self.rootPath)
+        if not self.isHeadless:
+            self.keyboard.write(self.rootPath)
 
         # XXX: This is temporary until instdata goes away completely.
         self.id.write()
@@ -668,6 +671,9 @@ class Anaconda(object):
 
         self.instLanguage.writeKS(f)
 
+        if not self.isHeadless:
+            self.keyboard.writeKS(f)
+
         # XXX: This is temporary until instdata goes away completely.
         self.id.writeKS(f)
 
@@ -712,6 +718,8 @@ if __name__ == "__main__":
     import users
     import kickstart
     import storage.storage_log
+    import system_config_keyboard.keyboard as keyboard
+
     from flags import flags
 
     # the following makes me very sad. -- katzj
@@ -957,8 +965,6 @@ if __name__ == "__main__":
 
     import instdata
 
-    import system_config_keyboard.keyboard as keyboard
-
     log.info("anaconda called with cmdline = %s" %(sys.argv,))
     log.info("Display mode = %s" % anaconda.displayMode)
 
@@ -1085,8 +1091,8 @@ if __name__ == "__main__":
 
     if opts.keymap:
         anaconda.dispatch.skipStep("keyboard", permanent = 1)
-        anaconda.id.keyboard.set(opts.keymap)
-        anaconda.id.keyboard.activate()
+        anaconda.keyboard.set(opts.keymap)
+        anaconda.keyboard.activate()
 
     if anaconda.ksdata:
         import storage
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
index 8bb7aebad..12ed6f66a 100644
--- a/booty/bootloaderInfo.py
+++ b/booty/bootloaderInfo.py
@@ -115,7 +115,7 @@ class KernelArguments:
         args = ""
         for s in self.getDracutStorageArgs() + [
                  self.anaconda.instLanguage.dracutSetupString(),
-                 self.id.keyboard.dracutSetupString(),
+                 self.anaconda.keyboard.dracutSetupString(),
                  self.args,
                  self.appendArgs ]:
             s = s.strip()
diff --git a/exception.py b/exception.py
index 936148e88..12840f427 100644
--- a/exception.py
+++ b/exception.py
@@ -107,8 +107,8 @@ def initExceptionHandling(anaconda):
                                  "instLanguage.localeInfo",
                                  "instLanguage.nativeLangNames",
                                  "instLanguage.tz",
-                                 "id.keyboard._mods._modelDict",
-                                 "id.keyboard.modelDict",
+                                 "keyboard._mods._modelDict",
+                                 "keyboard.modelDict",
                                  "id.storage.encryptionPassphrase",
                                  "id.rootPassword",
                                  "id.tmpData",
diff --git a/gui.py b/gui.py
index afb04db7b..700a0ca7a 100755
--- a/gui.py
+++ b/gui.py
@@ -1254,8 +1254,8 @@ class InstallInterface:
     def run(self, anaconda):
         self.anaconda = anaconda
 
-        if anaconda.id.keyboard and not flags.livecdInstall:
-            anaconda.id.keyboard.activate()
+        if anaconda.keyboard and not flags.livecdInstall:
+            anaconda.keyboard.activate()
 
         self.icw = InstallControlWindow (self.anaconda)
         self.icw.run (self.runres)
diff --git a/instdata.py b/instdata.py
index dcb2e17f4..fba1aa469 100644
--- a/instdata.py
+++ b/instdata.py
@@ -39,7 +39,6 @@ import shlex
 from flags import *
 from constants import *
 from simpleconfig import SimpleConfigFile
-import system_config_keyboard.keyboard as keyboard
 
 import logging
 log = logging.getLogger("anaconda")
@@ -55,7 +54,6 @@ class InstallData:
         # Reset everything except:
         #
         # - The install language
-        # - The keyboard
 
         self.network = network.Network()
         self.firewall = firewall.Firewall()
@@ -89,9 +87,6 @@ class InstallData:
             return None
 
     def write(self):
-        if not self.anaconda.isHeadless:
-            self.keyboard.write (self.anaconda.rootPath)
-
         self.timezone.write (self.anaconda.rootPath)
 
         args = ["--update", "--nostart"] + shlex.split(self.auth)
@@ -144,7 +139,6 @@ class InstallData:
 
     def writeKS(self, f):
         if not self.anaconda.isHeadless:
-            self.keyboard.writeKS(f)
             self.network.writeKS(f)
 
         if self.rootPassword["isCrypted"]:
@@ -166,7 +160,6 @@ class InstallData:
         self.storage.writeKS(f)
 
     def __init__(self, anaconda, extraModules):
-        self.keyboard = keyboard.Keyboard()
         self.anaconda = anaconda
         self.extraModules = extraModules
         self.simpleFilter = True
diff --git a/iw/kbd_gui.py b/iw/kbd_gui.py
index e8050ad48..95fc10651 100644
--- a/iw/kbd_gui.py
+++ b/iw/kbd_gui.py
@@ -35,5 +35,5 @@ class KeyboardWindow(InstallWindow, installKeyboardWindow):
 
     def getScreen(self, anaconda):
         default = anaconda.instLanguage.getDefaultKeyboard(anaconda.rootPath)
-        anaconda.id.keyboard.set(default)
-        return installKeyboardWindow.getScreen(self, default, anaconda.id.keyboard)
+        anaconda.keyboard.set(default)
+        return installKeyboardWindow.getScreen(self, default, anaconda.keyboard)
diff --git a/kickstart.py b/kickstart.py
index c1f22f4e1..05100fa75 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -382,9 +382,9 @@ class IscsiName(commands.iscsiname.FC6_IscsiName):
 
 class Keyboard(commands.keyboard.FC3_Keyboard):
     def execute(self, anaconda):
-        anaconda.id.keyboard.set(self.keyboard)
-        anaconda.id.keyboard.beenset = 1
-        anaconda.id.ksdata.skipSteps.append("keyboard")
+        anaconda.keyboard.set(self.keyboard)
+        anaconda.keyboard.beenset = 1
+        anaconda.ksdata.skipSteps.append("keyboard")
 
 class Lang(commands.lang.FC3_Lang):
     def execute(self, anaconda):
diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py
index 3dbc2d6e9..aa0201a3c 100644
--- a/textw/keyboard_text.py
+++ b/textw/keyboard_text.py
@@ -33,11 +33,11 @@ class KeyboardWindow:
     def __call__(self, screen, anaconda):
         if flags.serial or flags.virtpconsole:
 	    return INSTALL_NOOP
-        keyboards = anaconda.id.keyboard.modelDict.keys()
+        keyboards = anaconda.keyboard.modelDict.keys()
         keyboards.sort ()
 
-	if anaconda.id.keyboard.beenset:
-	    default = anaconda.id.keyboard.get ()
+	if anaconda.keyboard.beenset:
+	    default = anaconda.keyboard.get ()
 	else:
 	    default = anaconda.instLanguage.getDefaultKeyboard(anaconda.rootPath)
 
@@ -53,10 +53,10 @@ class KeyboardWindow:
         if button == TEXT_BACK_CHECK:
             return INSTALL_BACK
 
-        anaconda.id.keyboard.set (keyboards[choice])
-        anaconda.id.keyboard.beenset = 1
+        anaconda.keyboard.set (keyboards[choice])
+        anaconda.keyboard.beenset = 1
 
-        anaconda.id.keyboard.activate()
+        anaconda.keyboard.activate()
 
         # FIXME: eventually, kbd.activate will do this
 	try:
diff --git a/yuminstall.py b/yuminstall.py
index 8f7e6b2c8..53d6070aa 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1585,7 +1585,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
             anaconda.id.network.write(instPath=anaconda.rootPath, anaconda=anaconda)
             anaconda.id.storage.write(anaconda.rootPath)
             if not anaconda.isHeadless:
-                anaconda.id.keyboard.write(anaconda.rootPath)
+                anaconda.keyboard.write(anaconda.rootPath)
 
         # make a /etc/mtab so mkinitrd can handle certain hw (usb) correctly
         f = open(anaconda.rootPath + "/etc/mtab", "w+")