From 9ba1c8feff49f2d973012ac88fafa3b0e8649f51 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Mon, 21 Nov 2016 13:32:58 +1300
Subject: [PATCH] get subiquity to the point where it at least starts

---
 subiquity/controllers/filesystem.py      | 3 +++
 subiquity/controllers/installpath.py     | 3 +++
 subiquity/controllers/installprogress.py | 5 +++++
 subiquitycore/controllers/login.py       | 9 ++++-----
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/subiquity/controllers/filesystem.py b/subiquity/controllers/filesystem.py
index a2bf505a..a8a0b62a 100644
--- a/subiquity/controllers/filesystem.py
+++ b/subiquity/controllers/filesystem.py
@@ -81,6 +81,9 @@ class FilesystemController(BaseController):
 
     default = filesystem
 
+    def cancel(self):
+        self.signal.emit_signal('prev-screen')
+    
     def filesystem_error(self, error_fname):
         title = "Filesystem error"
         footer = ("Error while installing Ubuntu")
diff --git a/subiquity/controllers/installpath.py b/subiquity/controllers/installpath.py
index b7df6a13..7507a611 100644
--- a/subiquity/controllers/installpath.py
+++ b/subiquity/controllers/installpath.py
@@ -53,6 +53,9 @@ class InstallpathController(BaseController):
 
     default = installpath
 
+    def cancel(self):
+        self.signal.emit_signal('prev-screen')
+
     def install_ubuntu(self):
         log.debug("Installing Ubuntu path chosen.")
         self.signal.emit_signal('next-screen')
diff --git a/subiquity/controllers/installprogress.py b/subiquity/controllers/installprogress.py
index 1c6ddff0..c6cdccf5 100644
--- a/subiquity/controllers/installprogress.py
+++ b/subiquity/controllers/installprogress.py
@@ -138,6 +138,11 @@ class InstallProgressController(BaseController):
         log.debug('After curtin install OK')
         self.install_complete = True
 
+    default = curtin_install
+
+    def cancel(self):
+        pass
+
     @coroutine
     def curtin_postinstall(self):
         log.debug('Curtin Post Install: calling curtin '
diff --git a/subiquitycore/controllers/login.py b/subiquitycore/controllers/login.py
index e46a9450..a93585be 100644
--- a/subiquitycore/controllers/login.py
+++ b/subiquitycore/controllers/login.py
@@ -21,17 +21,16 @@ from subiquitycore.controller import BaseController
 
 class LoginController(BaseController):
 
-    signals = [
-        ('menu:login:main', 'login'),
-    ]
-
     def __init__(self, common):
         super().__init__(common)
         self.model = LoginModel()
 
-    def login(self):
+    def default(self):
         title = "Configuration Complete"
         excerpt = "Your device is now configured.  Login details below."
         self.ui.set_header(title, excerpt)
         view = LoginView(self.model, self.signal, self.model.user)
         self.ui.set_body(view)
+
+    def cancel(self):
+        pass