diff options
| author | Matt Wilson <msw@redhat.com> | 1999-09-25 19:31:54 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-09-25 19:31:54 +0000 |
| commit | b256de13e47ff731c99a940750bf440428577814 (patch) | |
| tree | 1d85f3773535c2a27e35b7d2aedb82019b31bcc8 /todo.py | |
| parent | cd2f5a889704ab197c5d44ee9bc81d7a78e60ab0 (diff) | |
| download | anaconda-b256de13e47ff731c99a940750bf440428577814.tar.gz anaconda-b256de13e47ff731c99a940750bf440428577814.tar.xz anaconda-b256de13e47ff731c99a940750bf440428577814.zip | |
more fixes.
Diffstat (limited to 'todo.py')
| -rw-r--r-- | todo.py | 51 |
1 files changed, 50 insertions, 1 deletions
@@ -204,6 +204,46 @@ class Language (SimpleConfigFile): return self.lang class Keyboard (SimpleConfigFile): + console2x = { + "be-latin1" : ('pc102', 'be'), + "be2-latin1" : ('pc102', 'be'), + "fr-latin0" : ('pc102', 'fr'), + "fr-latin1" : ('pc102', 'fr'), + "fr-pc" : ('pc102', 'fr'), + "fr" : ('pc102', 'fr'), + "bg" : ('pc102', 'bg'), + "cf" : ('pc102', 'cf'), + "cz-lat2-prog" : ('pc102', 'cs'), + "cz-lat2" : ('pc102', 'cs'), + "dk-latin1" : ('pc102', 'dk'), + "dk" : ('pc102', 'dk'), + "es" : ('pc102', 'es'), + "fi-latin1" : ('pc102', 'fi'), + "fi" : ('pc102', 'fi'), + "hu101" : ('pc102', 'hu'), + "it-ibm" : ('pc101', 'it'), + "it" : ('pc102', 'it'), + "it2" : ('pc102', 'it'), + "jp106" : ('jp106', 'jp'), + "no-latin1" : ('pc102', 'no'), + "no" : ('pc102', 'no'), + "pl" : ('pc102', 'pl'), + "pt-latin1" : ('pc102', 'pt'), + "ru-cp1251" : ('pc102', 'ru'), + "ru-ms" : ('microsoft', 'ru'), + "ru" : ('pc102', 'ru'), + "ru1" : ('pc102', 'ru'), + "ru2" : ('pc102', 'ru'), + "ru_win" : ('pc105', 'ru'), + "se-latin1" : ('pc102', 'se'), + "us" : ('pc101', 'us'), + "de-latin1-nodeadkeys" : ('pc102', 'de'), + "de-latin1" : ('pc102', 'de'), + "de" : ('pc102', 'de'), + "fr_CH-latin1" : ('pc102', 'fr_CH'), + "fr_CH" : ('pc102', 'fr_CH'), + "hu" : ('pc102', 'fr_CH'), + } # XXX fixme - externalize def __init__ (self): self.type = "PC" @@ -328,6 +368,11 @@ class Keyboard (SimpleConfigFile): else: return "us" + def getXKB (self): + if Keyboard.console2x.has_key (self.get ()): + (model, keylayout) = Keyboard.console2x[self.get ()] + return ("xfree86", model, keylayout, "", "") + class Authentication: def __init__ (self): self.useShadow = 1 @@ -400,7 +445,7 @@ class ToDo: self.x = x else: if mouse: - self.x = XF86Config (mouse) + self.x = XF86Config (mouse = mouse) else: self.x = XF86Config () @@ -1167,6 +1212,10 @@ class ToDo: todo.language.setByAbbrev(todo.instClass.language) if todo.instClass.keyboard: todo.keyboard.set(todo.instClass.keyboard) + if todo.instClass.keyboard != "us": + xkb = todo.keyboard.getXKB () + if xkb: + apply (todo.x.setKeyboard, xkb) (bootProto, ip, netmask, gateway, nameserver) = \ todo.instClass.getNetwork() |