summaryrefslogtreecommitdiffstats
path: root/partitioning.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-03-21 00:09:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-03-21 00:09:53 +0000
commitc29f0955045cdd02965a14300ce5e99364db2d1b (patch)
treed84a948b5288d9b0b9bd28649f608b8df9f18ea0 /partitioning.py
parent720f69db5a6df4a3d6afe90ea228b5a90fe41333 (diff)
downloadanaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.tar.gz
anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.tar.xz
anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.zip
merge taroon branch up until now. tagged as before-taroon-merge before and
will be tagged after-taroon-merge after. taroon at this point is tagged taroon-merge-point for where to base merges from in the future
Diffstat (limited to 'partitioning.py')
-rw-r--r--partitioning.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/partitioning.py b/partitioning.py
index 0d78ceb15..bb3b6dcf2 100644
--- a/partitioning.py
+++ b/partitioning.py
@@ -70,10 +70,7 @@ def partitionMethodSetup(partitions, dispatch):
if dispatch.stepInSkipList("partition") and not partitions.useAutopartitioning:
dispatch.skipStep("partition", skip = 0)
- if iutil.getArch() == "s390":
- dispatch.skipStep("fdasd", skip = not partitions.useFdisk)
- else:
- dispatch.skipStep("fdisk", skip = not partitions.useFdisk)
+ dispatch.skipStep("fdisk", skip = not partitions.useFdisk)
partitions.setProtected(dispatch)