summaryrefslogtreecommitdiffstats
path: root/installclass.py
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2003-01-08 19:02:02 +0000
committerMatt Wilson <msw@redhat.com>2003-01-08 19:02:02 +0000
commitf5b2064483ae525bfb148fa0b59cadf2df0933e9 (patch)
treeb8219e2e666ec6925efae6618cb4625ee9b569fe /installclass.py
parent7597631b95ad906a5a4a0fe6197eae7b93a6188c (diff)
downloadanaconda-f5b2064483ae525bfb148fa0b59cadf2df0933e9.tar.gz
anaconda-f5b2064483ae525bfb148fa0b59cadf2df0933e9.tar.xz
anaconda-f5b2064483ae525bfb148fa0b59cadf2df0933e9.zip
merge froms s390 branch
Diffstat (limited to 'installclass.py')
-rw-r--r--installclass.py22
1 files changed, 9 insertions, 13 deletions
diff --git a/installclass.py b/installclass.py
index fed21450f..46a5ea08c 100644
--- a/installclass.py
+++ b/installclass.py
@@ -145,26 +145,22 @@ class BaseInstallClass:
dispatch.skipStep("bootdisk")
dispatch.skipStep("bootloader")
dispatch.skipStep("fdasd", permanent = 1)
- elif iutil.getArch() == "s390" or iutil.getArch() == "s390x":
- #dispatch.skipStep("language")
+ elif iutil.getArch() == "s390":
dispatch.skipStep("keyboard", permanent = 1)
dispatch.skipStep("mouse", permanent = 1)
-
- dispatch.skipStep("partitionmethod", permanent = 1)
- dispatch.skipStep("autopartition", permanent = 1)
- dispatch.skipStep("autopartitionexecute", permanent = 1)
- dispatch.skipStep("fdisk", permanent = 1)
-
+ dispatch.skipStep("partitionmethod", permanent = 1)
+ dispatch.skipStep("autopartition", permanent = 1)
+ dispatch.skipStep("autopartitionexecute", permanent = 1)
+ dispatch.skipStep("fdisk", permanent = 1)
dispatch.skipStep("handleX11pkgs", permanent = 1)
dispatch.skipStep("videocard", permanent = 1)
dispatch.skipStep("monitor", permanent = 1)
dispatch.skipStep("xcustom", permanent = 1)
dispatch.skipStep("writexconfig", permanent = 1)
-
- dispatch.skipStep("bootdisk", permanent = 1)
- else:
- dispatch.skipStep("fdasd", permanent = 1)
-
+ dispatch.skipStep("bootdisk", permanent = 1)
+ else:
+ dispatch.skipStep("fdasd", permanent = 1)
+
# This is called after the hdlist is read in.
def setPackageSelection(self, hdlist):
pass