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

fix cloud-init status invocation

This commit is contained in:
Michael Hudson-Doyle 2021-02-12 11:37:34 +13:00
parent 8943b253e4
commit 5593f305b1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
subiquity/server/server.py
View File

@ -352,13 +352,14 @@ class SubiquityServer(Application):
self.cloud_init_ok = True
return
ci_start = time.time()
status_coro = arun_command(["cloud-init", "status", "--wait"])
try:
status_txt = arun_command(
["cloud-init", "status", "--wait"], timeout=600).stdout
except subprocess.TimeoutExpired:
status_cp = await asyncio.wait_for(status_coro, 600)
except asyncio.CancelledError:
status_txt = '<timeout>'
self.cloud_init_ok = False
else:
status_txt = status_cp.stdout
self.cloud_init_ok = True
log.debug("waited %ss for cloud-init", time.time() - ci_start)
if "status: done" in status_txt: