From 34499d445b85b5d4a13de74c9b65050a2acba415 Mon Sep 17 00:00:00 2001 From: "Samantha N. Bueno" Date: Wed, 10 Dec 2014 11:04:12 -0500 Subject: [PATCH] testing --- pyanaconda/ui/gui/spokes/storage.py | 11 ++++------- pyanaconda/ui/tui/spokes/storage.py | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 874e3e3..c51fe23 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -304,6 +304,10 @@ class StorageSpoke(NormalSpoke, StorageChecker): self.clearPartType = CLEARPART_TYPE_NONE if self.data.zerombr.zerombr and arch.isS390(): + # wait for the initial storage thread to complete before taking any new + # actions on storage devices + threadMgr.wait(constants.THREAD_STORAGE) + threadMgr.wait(constants.THREAD_EXECUTE_STORAGE) # run dasdfmt on any unformatted DASDs automatically threadMgr.add(AnacondaThread(name=constants.THREAD_DASDFMT, target=self.run_dasdfmt)) @@ -699,9 +703,6 @@ class StorageSpoke(NormalSpoke, StorageChecker): this instance doesn't include any of the UI pieces and should only really be getting called on ks installations with "zerombr". """ - # wait for the initial storage thread to complete before taking any new - # actions on storage devices - threadMgr.wait(constants.THREAD_STORAGE) to_format = make_unformatted_dasd_list(d.name for d in getDisks(self.storage.devicetree)) if not to_format: @@ -717,10 +718,6 @@ class StorageSpoke(NormalSpoke, StorageChecker): log.error(str(err)) continue - # I really hate doing this, but the way is the way; probably the most - # correct way to kajigger the storage spoke into becoming ready - self.execute() - # signal handlers def on_summary_clicked(self, button): # show the selected disks dialog diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py index 718e1f6..528d371 100644 --- a/pyanaconda/ui/tui/spokes/storage.py +++ b/pyanaconda/ui/tui/spokes/storage.py @@ -84,7 +84,7 @@ class StorageSpoke(NormalTUISpoke): if self.data.zerombr.zerombr and arch.isS390(): # if zerombr is specified in a ks file and there are unformatted # dasds, automatically format them - to_format = make_unformatted_dasd_list(self.selected_disks) + to_format = make_unformatted_dasd_list(d.name for d in getDisks(self.storage.devicetree)) if to_format: self.run_dasdfmt(to_format) -- 1.8.3.1