This reverts commit fbc7589a05c773824888c7e74dfc3826715ec432.
Related: rhbz#870207
---
pyanaconda/ui/gui/spokes/storage.py | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 16f35e6..1eb62ef 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -381,35 +381,11 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self.errors = str(e).split("\n")
communication.send_message(self.__class__.__name__,
_("Failed to save storage
configuration..."))
- original_type = self.data.autopart.type
- if original_type != AUTOPART_TYPE_LVM:
- communication.send_message(self.__class__.__name__,
- _("Automatic partitioning
failed..."))
- log.info("trying with lvm...")
- self.storage.reset()
- communication.send_message(self.__class__.__name__,
- _("Trying fallback
configuration..."))
- self.data.autopart.type = AUTOPART_TYPE_LVM
- self.storage.autoPartType = AUTOPART_TYPE_LVM
- try:
- doKickstartStorage(self.storage, self.data, self.instclass)
- except StorageError as e2:
- log.error("lvm failed, too: %s" % e2)
- else:
- self.errors = []
-
- if self.errors:
- communication.send_message(self.__class__.__name__,
- _("Failed to save storage
configuration..."))
- self.data.autopart.type = original_type
- self.data.clearpart.type = CLEARPART_TYPE_NONE
- self.data.clearpart.initAll = False
- self.storage.config.update(self.data)
- self.storage.autoPartType = original_type
- self.storage.reset()
- else:
- self.run() # emulating success path below
-
+ self.data.clearpart.type = CLEARPART_TYPE_NONE
+ self.data.clearpart.initAll = False
+ self.storage.config.update(self.data)
+ self.storage.autoPartType = self.data.autopart.type
+ self.storage.reset()
self.disks = getDisks(self.storage.devicetree)
else:
if self.autopart:
--
1.7.7.6