Merge pull request #651 from mwhudson/restart-after-fail-snafu

fix various restarting snafus

subiquity/controller.py

@@ -72,7 +72,7 @@ def configured(self):
             self.app.base_model.configured(self.model_name)
 
     def deserialize(self, state):
-        self.configured()
+        pass
 
     def make_autoinstall(self):
         return {}

subiquity/controllers/mirror.py

@@ -124,7 +124,6 @@ def serialize(self):
         return self.model.get_mirror()
 
     def deserialize(self, data):
-        super().deserialize(data)
         self.model.set_mirror(data)
 
     def done(self, mirror):

subiquity/controllers/proxy.py

@@ -53,7 +53,6 @@ def serialize(self):
         return self.model.proxy
 
     def deserialize(self, data):
-        super().deserialize(data)
         self.model.proxy = data
 
     def done(self, proxy):

subiquity/controllers/refresh.py

@@ -92,7 +92,7 @@ async def apply_autoinstall_config(self, index=1):
             if change['status'] == 'Done':
                 # Clearly if we got here we didn't get restarted by
                 # snapd/systemctl (dry-run mode or logged in via SSH)
-                self.app.restart()
+                self.app.restart(remove_last_screen=False)
             if change['status'] not in ['Do', 'Doing']:
                 raise Exception("update failed")
             await asyncio.sleep(0.1)

subiquity/controllers/welcome.py

@@ -62,7 +62,6 @@ def serialize(self):
         return self.model.selected_language
 
     def deserialize(self, data):
-        super().deserialize(data)
         self.model.switch_language(data)
 
     def make_autoinstall(self):

subiquity/core.py

@@ -131,7 +131,9 @@ def exit(self):
         else:
             super().exit()
 
-    def restart(self):
+    def restart(self, remove_last_screen=True):
+        if remove_last_screen:
+            self._remove_last_screen()
         self.urwid_loop.screen.stop()
         cmdline = ['snap', 'run', 'subiquity']
         if self.opts.dry_run:
@@ -168,6 +170,7 @@ def run(self):
             report = self.make_apport_report(
                 ErrorReportKind.UI, "Installer UI", interrupt=False, wait=True)
             print("report saved to {}".format(report.path))
+            self._remove_last_screen()
             raise
 
     def report_start_event(self, name, description, level="INFO"):

subiquitycore/core.py

@@ -485,10 +485,13 @@ def report_finish_event(self, name, description, status, level):
 
 # EventLoop -------------------------------------------------------------------
 
-    def exit(self):
+    def _remove_last_screen(self):
         state_path = os.path.join(self.state_dir, 'last-screen')
         if os.path.exists(state_path):
             os.unlink(state_path)
+
+    def exit(self):
+        self._remove_last_screen()
         self.aio_loop.stop()
 
     def run_scripts(self, scripts):
@@ -597,6 +600,9 @@ def load_serialized_state(self):
         for i, controller in enumerate(self.controllers.instances):
             if controller.name == last_screen:
                 controller_index = i
+        # Screens that have already been seen should be marked as configured.
+        for controller in self.controllers.instances[:controller_index]:
+            controller.configured()
         return controller_index
 
     def setraw(self):