From b5a6038f81d60139dc3e7240c7c185312967dbfb Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 9 Feb 2018 13:53:03 +1300
Subject: [PATCH 1/4] have a subiquity-service be part of the snap

---
 bin/subiquity-service | 8 ++++++++
 snapcraft.yaml        | 9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 bin/subiquity-service

diff --git a/bin/subiquity-service b/bin/subiquity-service
new file mode 100644
index 00000000..800dc295
--- /dev/null
+++ b/bin/subiquity-service
@@ -0,0 +1,8 @@
+#!/bin/sh
+/bin/dmesg -n 1
+loadkeys - <<EOF
+ string F91 = "\033[Z"
+ keycode 15 = Tab F91
+EOF
+export SNAP_REXEC=0
+/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c18d7c9a..39cd0638 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -13,9 +13,10 @@ apps:
     command: usr/bin/console-conf
   probert:
     command: bin/probert
-  started:
-    command: usr/bin/started
-    daemon: oneshot
+  subiquity-service:
+    command: usr/bin/subiquity-service
+    daemon: simple
+    #?? restart-condition: always
 
 parts:
   subiquity:
@@ -48,7 +49,7 @@ parts:
       'bin/subiquity-tui': usr/bin/subiquity
       'bin/subiquity-loadkeys': usr/bin/subiquity-loadkeys
       'bin/curtin-journald-forwarder': usr/bin/curtin-journald-forwarder
-      'bin/started': usr/bin/started
+      'bin/subiquity-service': usr/bin/subiquity-service
     stage:
       - usr/bin
     prime:

From 5198ff4b12a184d9e2791c7f11ed36aa1c0a7965 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 9 Feb 2018 14:18:32 +1300
Subject: [PATCH 2/4] chmod u+x bin/subiquity-service :(

---
 bin/subiquity-service | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/subiquity-service

diff --git a/bin/subiquity-service b/bin/subiquity-service
old mode 100644
new mode 100755

From 6d08f080c29e3248a64474510393cc543bbcad96 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 9 Feb 2018 15:10:00 +1300
Subject: [PATCH 3/4] we do not need this any more

---
 bin/started | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100755 bin/started

diff --git a/bin/started b/bin/started
deleted file mode 100755
index 0e930fe7..00000000
--- a/bin/started
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-true
\ No newline at end of file

From e8c167d825ff8d3f6292deab1a32ebd00b6b112b Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Tue, 13 Feb 2018 12:42:34 +1300
Subject: [PATCH 4/4] this is a more appropriate restart-condition for us i
 think

---
 snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 39cd0638..ca0b975a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -16,7 +16,7 @@ apps:
   subiquity-service:
     command: usr/bin/subiquity-service
     daemon: simple
-    #?? restart-condition: always
+    restart-condition: always
 
 parts:
   subiquity: