From e3aadb195b3210d20174ecc2486ef06931f65b78 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Wed, 23 Nov 2016 12:08:36 +1300
Subject: [PATCH] add a way to run console-conf or subiquity with a subset of
 the screens

---
 bin/console-conf-tui      | 1 +
 bin/subiquity-tui         | 1 +
 subiquitycore/core.py     | 2 ++
 subiquitycore/ui/frame.py | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/console-conf-tui b/bin/console-conf-tui
index 40d4f2c4..c40d962d 100755
--- a/bin/console-conf-tui
+++ b/bin/console-conf-tui
@@ -52,6 +52,7 @@ def parse_options(argv):
     parser.add_argument('--machine-config', metavar='CONFIG',
                         dest='machine_config',
                         help="Don't Probe. Use probe data file")
+    parser.add_argument('--screens', action='append', dest='screens', default=[])
     return parser.parse_args(argv)
 
 
diff --git a/bin/subiquity-tui b/bin/subiquity-tui
index 2e179817..fb8d6b4b 100755
--- a/bin/subiquity-tui
+++ b/bin/subiquity-tui
@@ -63,6 +63,7 @@ def parse_options(argv):
     parser.add_argument('--uefi', action='store_true',
                         dest='uefi',
                         help='run in uefi support mode')
+    parser.add_argument('--screens', action='append', dest='screens', default=[])
     return parser.parse_args(argv)
 
 
diff --git a/subiquitycore/core.py b/subiquitycore/core.py
index e5243502..4064bc41 100644
--- a/subiquitycore/core.py
+++ b/subiquitycore/core.py
@@ -98,6 +98,8 @@ class Application:
             "loop": None,
             "pool": futures.ThreadPoolExecutor(1),
         }
+        if opts.screens:
+            self.controllers = [c for c in self.controllers if c in opts.screens]
         ui.progress_completion = len(self.controllers)
         self.common['controllers'] = dict.fromkeys(self.controllers)
         self.controller_index = -1
diff --git a/subiquitycore/ui/frame.py b/subiquitycore/ui/frame.py
index 292ec98d..2afb06ef 100644
--- a/subiquitycore/ui/frame.py
+++ b/subiquitycore/ui/frame.py
@@ -29,7 +29,7 @@ class SubiquityUI(WidgetWrap):
     def __init__(self):
         self.header = Header()
         self.body = Body()
-        self.footer = Footer("", 0, 0)
+        self.footer = Footer("", 0, 1)
         self.frame = Frame(self.body, header=self.header, footer=self.footer)
         self.progress_current = 0
         self.progress_completion = 0