|
...
|
...
|
@@ -79,7 +79,11 @@ class OstreeInstaller(Installer):
|
|
79
|
79
|
return ActionResult(True, None)
|
|
80
|
80
|
|
|
81
|
81
|
def get_ostree_repo_url(self):
|
|
82
|
|
- return self.window.do_action()
|
|
|
82
|
+ if self.ks_config != None:
|
|
|
83
|
+ self.ostree_repo_url = self.ks_config['ostree_repo_url']
|
|
|
84
|
+ self.ostree_ref = self.ks_config['ostree_repo_ref']
|
|
|
85
|
+ return
|
|
|
86
|
+ self.window.do_action()
|
|
83
|
87
|
|
|
84
|
88
|
def deploy_ostree(self, repo_url, repo_ref):
|
|
85
|
89
|
self.run("ostree admin --sysroot={} init-fs {}".format(self.photon_root, self.photon_root), "Initializing OSTree filesystem")
|
|
...
|
...
|
@@ -184,13 +188,11 @@ class OstreeInstaller(Installer):
|
|
184
|
184
|
|
|
185
|
185
|
self.run("{} {} {}".format(self.unmount_disk_command, '-w', self.photon_root))
|
|
186
|
186
|
|
|
187
|
|
- if self.iso_installer:
|
|
188
|
|
- self.progress_bar.show_loading('Press any key to continue to boot')
|
|
189
|
|
- self.progress_bar.hide()
|
|
190
|
|
- self.window.addstr(0, 0,
|
|
191
|
|
- "Congratulations, Photon has been installed in {} secs.\n\nPress any key to continue to boot...".format(self.progress_bar.time_elapsed))
|
|
192
|
|
- if self.ks_config == None:
|
|
193
|
|
- self.window.content_window().getch()
|
|
|
187
|
+ self.progress_bar.hide()
|
|
|
188
|
+ self.window.addstr(0, 0,
|
|
|
189
|
+ "Congratulations, Photon has been installed in {} secs.\n\nPress any key to continue to boot...".format(self.progress_bar.time_elapsed))
|
|
|
190
|
+ if self.ks_config == None:
|
|
|
191
|
+ self.window.content_window().getch()
|
|
194
|
192
|
|
|
195
|
193
|
return ActionResult(True, None)
|
|
196
|
194
|
|