Browse code

Fix OSTree host installation fails.

Mahmoud Bassiouny authored on 2015/08/15 08:07:04
Showing 3 changed files
... ...
@@ -347,7 +347,7 @@ class Installer(object):
347 347
     def run(self, command, comment = None):
348 348
         if comment != None:
349 349
             print >> sys.stderr, "Installer: {} ".format(comment)
350
-            self.progress_bar.show_loading(comment)
350
+            self.progress_bar.update_loading_message(comment)
351 351
 
352 352
         print >> sys.stderr, "Installer: {} ".format(command)
353 353
         process = subprocess.Popen([command], shell=True, stdout=self.output)
... ...
@@ -4,23 +4,11 @@
4 4
 #
5 5
 #    Author: Touseef Liaqat <tliaqat@vmware.com>
6 6
 
7
-import subprocess
8
-import curses
9 7
 import os
10
-import crypt
11
-import re
12
-import random
13
-import string
14
-import shutil
15
-import fnmatch
16
-import signal
17
-import sys
18 8
 import glob
19
-import urllib
20 9
 import modules.commons
21
-import xml.etree.ElementTree as ET
22
-from jsonwrapper import JsonWrapper
23 10
 from installer import Installer
11
+from actionresult import ActionResult
24 12
 
25 13
 class OstreeInstaller(Installer):
26 14
 
... ...
@@ -158,11 +146,14 @@ class OstreeInstaller(Installer):
158 158
         deployment_fstab = os.path.join(deployment, "etc/fstab")
159 159
         self.run("echo \"/dev/sda2    /boot    ext4   defaults   1 2  \" >> {} ".format(deployment_fstab), "Adding /boot mount point in fstab")
160 160
         self.run("mount --bind {} {}".format(deployment, self.photon_root))
161
-        self.progress_bar.show_loading("Starting post install modules")
161
+        self.progress_bar.update_loading_message("Starting post install modules")
162 162
         self.execute_modules(modules.commons.POST_INSTALL)
163
-        self.progress_bar.show_loading("Unmounting disks")
163
+        self.progress_bar.update_loading_message("Unmounting disks")
164 164
         self.run("{} {} {}".format(self.unmount_disk_command, '-w', self.photon_root))
165
-        self.progress_bar.show_loading("Ready to restart")
165
+        self.progress_bar.update_loading_message("Ready to restart")
166 166
         self.progress_bar.hide()
167
+        self.window.addstr(0, 0, 'Congratulations, Photon has been installed in {0} secs.\n\nPress any key to continue to boot...'.format(self.progress_bar.time_elapsed))
168
+        if self.ks_config == None:
169
+            self.window.content_window().getch()
167 170
         return ActionResult(True, None)
168 171
 
... ...
@@ -115,7 +115,9 @@ class ProgressBar(object):
115 115
     def show_loading(self, message):
116 116
         self.loadding_timer = threading.Timer(self.loading_interval, self.update_loading_symbol)
117 117
         self.loadding_timer.start()
118
+        self.update_loading_message(message)
118 119
 
120
+    def update_loading_message(self, message):
119 121
         self.message_len = len(message)
120 122
         spaces = ' ' * self.width
121 123
         self.update_message(' ')