[rhel7-branch/master][PATCH] Do not add step for realmd if we are not gonna run it (#1058755)

Vratislav Podzimek vpodzime at redhat.com
Wed Jan 29 13:00:33 UTC 2014


Otherwise the progress bar won't reach the 100 % if no AP/IPA is configured to
be discovered.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/install.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index c8181a3..7ad47c7 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -121,9 +121,14 @@ def doInstall(storage, payload, ksdata, instClass):
     # those are the ones that take the most time.
     steps = len(storage.devicetree.findActions(type="create", object="format")) + \
             len(storage.devicetree.findActions(type="resize", object="format"))
-    steps += 6
-    # pre setup phase, packages setup, packages, bootloader, realmd,
-    # post install
+
+    # pre setup phase, packages setup, packages, bootloader, post install
+    steps += 5
+
+    # joining AD/IPA domain
+    if ksdata.realm.join_realm:
+        steps += 1
+
     progressQ.send_init(steps)
 
     # This should be the only thread running, wait for the others to finish if not.
-- 
1.8.5.3



More information about the anaconda-patches mailing list