StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #285 from CanonicalLtd/mwhudson/copy-more-logs 

copy more logs (subiquity, journal) to target system
This commit is contained in:
Michael Hudson-Doyle 2018-02-13 12:23:09 +13:00 committed by GitHub
parent 5adce07230 eddb967155
commit 274ff22e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
subiquity/controllers/installprogress.py
View File

@ -67,7 +67,7 @@ class InstallProgressController(BaseController):
def identity_config_done(self): def identity_config_done(self):
if self.install_state == InstallState.DONE: if self.install_state == InstallState.DONE:
self.curtin_configure_cloud_init() self.postinstall_configuration()
else: else:
self._identity_config_done = True self._identity_config_done = True
@ -170,15 +170,19 @@ class InstallProgressController(BaseController):
self.install_state = InstallState.DONE self.install_state = InstallState.DONE
log.debug('After curtin install OK') log.debug('After curtin install OK')
if self._identity_config_done: if self._identity_config_done:
self.loop.set_alarm_in(0.01, lambda loop, userdata: self.curtin_configure_cloud_init()) self.loop.set_alarm_in(0.01, lambda loop, userdata: self.postinstall_configuration())
def cancel(self): def cancel(self):
pass pass
def curtin_configure_cloud_init(self): def postinstall_configuration(self):
# If we need to do anything that takes time here (like running # If we need to do anything that takes time here (like running
# dpkg-reconfigure maas-rack-controller, for example...) we # dpkg-reconfigure maas-rack-controller, for example...) we
# should switch to doing that work in a background thread. # should switch to doing that work in a background thread.
self.configure_cloud_init()
self.copy_logs_to_target()
def configure_cloud_init(self):
if self.opts.dry_run: if self.opts.dry_run:
target = '.subiquity' target = '.subiquity'
else: else:
@ -192,6 +196,18 @@ class InstallProgressController(BaseController):
if self.answers['reboot']: if self.answers['reboot']:
self.loop.set_alarm_in(0.01, lambda loop, userdata: self.reboot()) self.loop.set_alarm_in(0.01, lambda loop, userdata: self.reboot())
def copy_logs_to_target(self):
if self.opts.dry_run:
return
utils.run_command(['cp', '-aT', '/var/log/installer', '/target/var/log/installer'])
try:
with open('/target/var/log/installer/installer-journal.txt', 'w') as output:
subprocess.run(
['journalctl'],
stdout=output, stderr=subprocess.STDOUT, stdin=subprocess.DEVNULL)
except Exception:
log.exception("saving journal failed")
def update_log_tail(self): def update_log_tail(self):
if self.tail_proc is None: if self.tail_proc is None:
return return