Automatically setting the keyboard layout is a little harder, I can re add the wizard screen to select it which is enough to get it working but means the user needs to select there keyboard layout again. What I will try and do first is read the keyboard layout from setxkbmap -query then set it based off that. I can't see anywhere where the current keyboard choice is stored other then /etc/sysconfig/keyboard and yast doesn't use standard naming with what it writes there. Suggestions here are welcome.