diff options
| author | Joel Granados Moreno <jgranado@redhat.com> | 2009-03-27 16:15:01 +0100 |
|---|---|---|
| committer | Joel Granados Moreno <jgranado@redhat.com> | 2009-03-27 16:15:01 +0100 |
| commit | a6cca07d229f15c05e582590f974ebb43bd66290 (patch) | |
| tree | e43111d4a1e451bad4341a54340d83047883694b /storage | |
| parent | 420a2afd509f532eb34adbb1c842f0445d184fee (diff) | |
| download | anaconda-a6cca07d229f15c05e582590f974ebb43bd66290.tar.gz anaconda-a6cca07d229f15c05e582590f974ebb43bd66290.tar.xz anaconda-a6cca07d229f15c05e582590f974ebb43bd66290.zip | |
Revert "Don't do format-specific processing on devices targeted by clearpart. (#492123)"
This reverts commit 420a2afd509f532eb34adbb1c842f0445d184fee.
I messed up here with a dirty branch.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/__init__.py | 2 | ||||
| -rw-r--r-- | storage/devicetree.py | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/storage/__init__.py b/storage/__init__.py index 09eef560d..16a69222d 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -199,7 +199,6 @@ class Storage(object): ignored=self.ignoredDisks, exclusive=self.exclusiveDisks, clear=self.clearPartDisks, - clearpart=self.clearPartType, reinitializeDisks=self.reinitializeDisks, protected=self.protectedPartitions, zeroMbr=self.zeroMbr, @@ -258,7 +257,6 @@ class Storage(object): ignored=self.ignoredDisks, exclusive=self.exclusiveDisks, clear=self.clearPartDisks, - clearpart=self.clearPartType, reinitializeDisks=self.reinitializeDisks, protected=self.protectedPartitions, zeroMbr=self.zeroMbr, diff --git a/storage/devicetree.py b/storage/devicetree.py index 0533abd88..b9552bd98 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -24,8 +24,6 @@ import os import block import re -from pykickstart.constants import * - from errors import * from devices import * from deviceaction import * @@ -190,14 +188,13 @@ class DeviceTree(object): def __init__(self, intf=None, ignored=[], exclusive=[], clear=[], zeroMbr=None, reinitializeDisks=None, protected=[], - clearpart=None, passphrase=None, luksDict=None): + passphrase=None, luksDict=None): # internal data members self._devices = [] self._actions = [] self.intf = intf self.exclusiveDisks = exclusive - self.clearPartType = clearpart self.clearPartDisks = clear self.zeroMbr = zeroMbr self.reinitializeDisks = reinitializeDisks @@ -1159,18 +1156,6 @@ class DeviceTree(object): format = formats.getFormat(*args, **kwargs) device.format = format - if self.clearPartType in (CLEARPART_TYPE_LINUX, CLEARPART_TYPE_ALL): - if not self.clearPartDisks: - # we're clearing all disks - return - - for disk in self.clearPartDisks: - # if this device is going to be cleared we don't need to - # continue messing with it - dev = self.getDeviceByName(disk) - if dev and dev == device or device.dependsOn(dev): - return - # # now lookup or create any compound devices we have discovered # |