summaryrefslogtreecommitdiffstats
path: root/storage/devicetree.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-04-30 17:11:47 -0400
committerChris Lumens <clumens@redhat.com>2009-05-01 17:07:04 -0400
commit448f74117c8f3fb4e79808e04a6bdbbca56ba178 (patch)
treec87319aea71b07105586809a973c7b3bca4670f7 /storage/devicetree.py
parent63ffe913224e7e8ca0a313d686a9fa835848e72c (diff)
downloadanaconda-448f74117c8f3fb4e79808e04a6bdbbca56ba178.tar.gz
anaconda-448f74117c8f3fb4e79808e04a6bdbbca56ba178.tar.xz
anaconda-448f74117c8f3fb4e79808e04a6bdbbca56ba178.zip
Don't call udevDeviceFormat if we're just going to clear the device (#497323).
Diffstat (limited to 'storage/devicetree.py')
-rw-r--r--storage/devicetree.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/devicetree.py b/storage/devicetree.py
index 2752b4bf6..e6c061476 100644
--- a/storage/devicetree.py
+++ b/storage/devicetree.py
@@ -27,6 +27,8 @@ import re
from errors import *
from devices import *
from deviceaction import *
+from partitioning import shouldClear
+from pykickstart.constants import *
import formats
import devicelibs.mdraid
from udev import *
@@ -1174,7 +1176,9 @@ class DeviceTree(object):
device = self.addUdevPartitionDevice(info)
# now handle the device's formatting
- self.handleUdevDeviceFormat(info, device)
+ if not shouldClear(device, self.clearPartType, self.clearPartDisks,
+ self.protectedPartitions):
+ self.handleUdevDeviceFormat(info, device)
def handleUdevLUKSFormat(self, info, device):
log_method_call(self, name=device.name, type=device.format.type)