Merge pull request #741 from mwhudson/restart-ssh-subiquity-on-refresh

restart subiquity when snap refresh completes
This commit is contained in:
Michael Hudson-Doyle 2020-04-30 21:18:25 +12:00 committed by GitHub
commit 3908449039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions

View File

@ -256,9 +256,9 @@ class RefreshView(BaseView):
self.update_failed(exc_message(e))
return
if change['status'] == 'Done':
# Will only get here dry run mode as part of the refresh is us
# getting restarted by snapd...
self.done()
# Clearly if we got here we didn't get restarted by
# snapd/systemctl (dry-run mode or logged in via SSH)
self.controller.app.restart(remove_last_screen=False)
return
if change['status'] not in ['Do', 'Doing']:
self.update_failed(change.get('err', "Unknown error"))

View File

@ -125,9 +125,7 @@ network:
name: "eth*"
dhcp4: true
wifis:
"all-wifi":
match:
name: "wl*"
"wlsp4":
dhcp4: true
access-points:
"some-ap":