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

remove server-state file when starting up dry-run system_setup

This commit is contained in:
Michael Hudson-Doyle 2021-09-22 13:27:08 +12:00
parent c0f1bbf5a1
commit 3b6436434c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subiquity/client/client.py
View File

@ -303,8 +303,7 @@ class SubiquityClient(TuiApplication):
"waiting for cloud-init", self._status_get(cur=status.state))
if status.state == ApplicationState.EARLY_COMMANDS:
print("running early commands")
status = await spinning_wait(
"waiting for cloud-init", self._status_get(cur=status.state))
status = await self._status_get(cur=status.state)
await asyncio.sleep(0.5)
return status

2
system_setup/cmd/tui.py
View File

@ -95,6 +95,8 @@ def main():
need_start_server = True
server_output_dir = '/tmp/.subiquity'
sock_path = os.path.join(server_output_dir, 'socket')
if os.path.exists('.subiquity/run/subiquity/server-state'):
os.unlink('.subiquity/run/subiquity/server-state')
opts.socket = sock_path
server_args = ['--dry-run', '--socket=' + sock_path] + unknown
else: