diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-01-09 00:53:27 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-01-09 00:53:27 +0000 |
| commit | 09bb99f8845738fe2a23a45d2505493d61480b5a (patch) | |
| tree | f85ebd1beaed4dbd28766b85c05871bb53cac518 /partitioning.py | |
| parent | 46fd98e4e68277e5f11a82e57e94c728d1d1c9b7 (diff) | |
| download | anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.tar.gz anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.tar.xz anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.zip | |
iutil.getArch now returns s390 for s390x, clean up to handle this nicely
Diffstat (limited to 'partitioning.py')
| -rw-r--r-- | partitioning.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/partitioning.py b/partitioning.py index 01f2d7c3e..753d4efd9 100644 --- a/partitioning.py +++ b/partitioning.py @@ -689,8 +689,6 @@ def getDefaultDiskType(): return parted.disk_type_get("GPT") elif iutil.getArch() == "s390": return parted.disk_type_get("dasd") - elif iutil.getArch() == "s390x": - return parted.disk_type_get("dasd") else: # XXX fix me for alpha at least return parted.disk_type_get("msdos") @@ -698,7 +696,6 @@ def getDefaultDiskType(): archLabels = {'i386': ['msdos'], 'alpha': ['bsd'], 's390': ['dasd'], - 's390x': ['dasd'], 'ia64': ['msdos', 'GPT']} def checkDiskLabel(disk, intf): @@ -1533,7 +1530,7 @@ class DiskSet: recreate = 1 if recreate == 1 and not flags.test: - if iutil.getArch() == "s390" or iutil.getArch() == "s390x": + if iutil.getArch() == "s390": if (self.dasdFmt(intf, drive)): DiskSet.skippedDisks.append(drive) continue @@ -1556,7 +1553,7 @@ class DiskSet: DiskSet.skippedDisks.append(drive) continue elif ret == -1: - if iutil.getArch() == "s390" or iutil.getArch() == "s390x": + if iutil.getArch() == "s390": if (self.dasdFmt(intf, drive)): DiskSet.skippedDisks.append(drive) continue @@ -1636,7 +1633,7 @@ def checkNoDisks(diskset, intf): sys.exit(0) def partitionObjectsInitialize(diskset, partitions, dir, intf): - if iutil.getArch() == "s390" or iutil.getArch() == "s390x": + if iutil.getArch() == "s390": partitions.useAutopartitioning = 0 partitions.useFdisk = 1 @@ -1672,7 +1669,7 @@ def partitionMethodSetup(partitions, dispatch): skip = not partitions.useAutopartitioning) dispatch.skipStep("autopartitionexecute", skip = not partitions.useAutopartitioning) - if iutil.getArch() == "s390" or iutil.getArch() == "s390x": + if iutil.getArch() == "s390": dispatch.skipStep("fdasd", skip = not partitions.useFdisk) else: dispatch.skipStep("fdisk", skip = not partitions.useFdisk) |