(drmike) Fix for bug #10109 - keyboard was not setup properly for foreign keyboards in kickstart mode

1 files changed, 7 insertions, 0 deletions

diff --git a/todo.py b/todo.py
index 63074a42c..086392eae 100644
--- a/todo.py
+++ b/todo.py
@@ -833,13 +833,19 @@ class ToDo:
 			      isCrypted = todo.instClass.rootPasswordCrypted)
 	if todo.instClass.language:
 	    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)
 
+                    # hack - apply to instclass preset if present as well
+                    if (todo.instClass.x):
+                        apply (todo.instClass.x.setKeyboard, xkb)
+
 	(bootProto, ip, netmask, gateway, nameserver) = \
 		todo.instClass.getNetwork()
 	if bootProto:
@@ -1282,6 +1288,7 @@ class ToDo:
                                    self.instPath + "/etc/X11/X.rpmsave")
 		    os.symlink ("../../usr/X11R6/bin/XF86_" + self.x.server,
 				self.instPath + "/etc/X11/X")
+
 		self.x.write (self.instPath + "/etc/X11/XF86Config")
             self.setDefaultRunlevel ()
             # go ahead and depmod modules on alpha, as rtc modprobe