---
storage/deviceaction.py | 2 --
storage/devices.py | 2 --
storage/formats/disklabel.py | 3 +++
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/storage/deviceaction.py b/storage/deviceaction.py
index df84c2d..2140b52 100644
--- a/storage/deviceaction.py
+++ b/storage/deviceaction.py
@@ -266,7 +266,6 @@ class ActionCreateFormat(DeviceAction):
self.device.setFlag(self.format.partedFlag)
self.device.disk.format.commit()
- udev_settle()
self.device.setup()
self.device.format.create(intf=intf,
device=self.device.path,
@@ -313,7 +312,6 @@ class ActionDestroyFormat(DeviceAction):
# unset partition flags and commit
self._device.unsetFlag(self.origFormat.partedFlag)
self._device.disk.format.commit()
- udev_settle()
# set up our copy of the original device stack since the
# reference we got may have had any number of things changed
diff --git a/storage/devices.py b/storage/devices.py
index 3cb65aa..de55547 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -1116,7 +1116,6 @@ class PartitionDevice(StorageDevice):
self.disk.format.addPartition(self.partedPartition)
self.disk.format.commit()
- udev_settle(timeout=10)
# Ensure old metadata which lived in freespace so did not get
# explictly destroyed by a destroyformat action gets wiped
@@ -1162,7 +1161,6 @@ class PartitionDevice(StorageDevice):
end=geometry.end)
self.disk.format.commit()
- self.notifyKernel()
def destroy(self):
""" Destroy the device. """
diff --git a/storage/formats/disklabel.py b/storage/formats/disklabel.py
index 3f8b1e7..66050e9 100644
--- a/storage/formats/disklabel.py
+++ b/storage/formats/disklabel.py
@@ -27,6 +27,7 @@ from iutil import log_method_call
import parted
import platform
from ..errors import *
+from ..udev import udev_settle
from . import DeviceFormat, register_device_format
import gettext
@@ -200,6 +201,8 @@ class DiskLabel(DeviceFormat):
except parted.DiskException as msg:
log.warning(msg)
attempt += 1
+ else:
+ udev_settle()
if keepTrying:
raise DeviceError("cannot commit to disk after %d attempts" % (maxTries,))
--
1.6.0.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
