diff options
| -rw-r--r-- | dispatch.py | 1 | ||||
| -rwxr-xr-x | gui.py | 1 | ||||
| -rw-r--r-- | installclass.py | 7 |
3 files changed, 9 insertions, 0 deletions
diff --git a/dispatch.py b/dispatch.py index fc727f265..0b337864d 100644 --- a/dispatch.py +++ b/dispatch.py @@ -65,6 +65,7 @@ installSteps = [ ("findrootparts", findRootParts, ("intf", "id", "dispatch", "dir", "instPath")), ("findinstall", ("dispatch", "intf", "id", "instPath")), ("installtype", ("dispatch", "id", "method", "intf")), + ("zfcpconfig", ("id.zfcp", "id.diskset", "intf")), ("partitionmethod", ("id.partitions", "id.instClass")), ("partitionobjinit", partitionObjectsInitialize, ("id.diskset", "id.partitions", @@ -47,6 +47,7 @@ stepToClass = { "mouse" : ("mouse_gui", "MouseWindow"), "welcome" : ("welcome_gui", "WelcomeWindow"), "installtype" : ("installpath_gui", "InstallPathWindow"), + "zfcpconfig" : ("zfcp_gui", "ZFCPWindow"), "partitionmethod" : ("partmethod_gui", "PartitionMethodWindow"), "partition" : ("partition_gui", "PartitionWindow"), "autopartition" : ("partition_gui", "AutoPartitionWindow"), diff --git a/installclass.py b/installclass.py index 12988c0d0..a687ee058 100644 --- a/installclass.py +++ b/installclass.py @@ -124,6 +124,7 @@ class BaseInstallClass: "findrootparts", "betanag", "installtype", + "zfcpconfig", "partitionmethod", "partitionobjinit", "partitionmethodsetup", @@ -169,6 +170,9 @@ class BaseInstallClass: if not BETANAG: dispatch.skipStep("betanag", permanent=1) + if iutil.getArch() != "s390": + dispatch.skipStep("zfcpconfig") + if iutil.getArch() != "i386" or 1: dispatch.skipStep("bootdisk") @@ -358,6 +362,9 @@ class BaseInstallClass: def setSELinux(self, id, sel): id.security.setSELinux(sel) + def setZFCP(self, id, fcpdev): + id.zfcp.fcpdevices = fcpdev + def setFirewall(self, id, enable = 1, trusts = [], ports = []): id.firewall.enabled = enable id.firewall.trustdevs = trusts |