whee! merge the first bunch of changes from the 390 branch. this

incorporates most of the python changes as well as the isys changes.

email with what hasn't been applied coming later after I either finish merging
the rest or decide to stop for the night

1 files changed, 5 insertions, 1 deletions

diff --git a/gui.py b/gui.py
index 9c5af5c47..ef83c2e36 100755
--- a/gui.py
+++ b/gui.py
@@ -43,6 +43,7 @@ stepToClass = {
     "addswap" : ("upgrade_swap_gui", "UpgradeSwapWindow"),
     "upgrademigratefs" : ("upgrade_migratefs_gui", "UpgradeMigrateFSWindow"),
     "fdisk" : ("fdisk_gui", "FDiskWindow"),
+    "fdasd" : ("fdasd_gui", "FDasdWindow"),
     "format" : ("format_gui", "FormatWindow"),
     "bootloader": ("bootloader_gui", "BootloaderWindow"), 
     "bootloaderpassword" : ("bootloaderpassword_gui", "BootloaderPasswordWindow"),
@@ -71,6 +72,8 @@ stepToClass = {
 
 if iutil.getArch() == 'sparc':
     stepToClass["bootloader"] = ("silo_gui", "SiloWindow")
+elif iutil.getArch() == 's390' or iutil.getArch() == 's390x':
+    stepToClass["bootloader"] = ("zipl_gui", "ZiplWindow")
 else:
     stepToClass["bootloader"] = ("bootloader_gui", "BootloaderWindow")
 
@@ -343,7 +346,8 @@ class InstallInterface:
             except SystemError:
                 pass
 
-        if id.keyboard:
+        # XXX x_already_set is a hack
+        if id.keyboard and not id.x_already_set:
 	    info = id.keyboard.getXKB()
 	    if info:
                 (rules, model, layout, variant, options) = info