From 79961af5c26b3bca3278417065c10e4f82aed1fc Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@gmail.com>
Date: Thu, 7 Apr 2016 20:48:32 +0000
Subject: [PATCH] Move off tty7, which is used by upstart

---
 server/modules/autoimage.py  |  8 ++++----
 server/modules/certclient.py | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/modules/autoimage.py b/server/modules/autoimage.py
index 8c29f92..8d931a5 100755
--- a/server/modules/autoimage.py
+++ b/server/modules/autoimage.py
@@ -114,12 +114,12 @@ description "AutoImage"
 start on runlevel [2345]
 
 script
-  exec </dev/tty7 >/dev/tty7 2>&1
-  chvt 7
+  exec </dev/tty8 >/dev/tty8 2>&1
+  chvt 8
   /icon/iconograph/client/wait_for_service.py --host=%(host)s --service=%(service)s
-  chvt 7
+  chvt 8
   /icon/iconograph/imager/image.py --device=%(device)s --persistent-percent=%(persistent_percent)d --ca-cert=/icon/config/ca.image.cert.pem --base-url=%(base_url)s %(image_flags)s
-  chvt 7
+  chvt 8
 
   echo
   echo "=================="
diff --git a/server/modules/certclient.py b/server/modules/certclient.py
index 20505eb..7d8b4f1 100755
--- a/server/modules/certclient.py
+++ b/server/modules/certclient.py
@@ -103,8 +103,8 @@ description "CertClient %(tag)s"
 start on systemid-ready
 
 script
-  exec </dev/tty8 >/dev/tty8 2>&1
-  chvt 8
+  exec </dev/tty9 >/dev/tty9 2>&1
+  chvt 9
 
   KEY="/systemid/$(hostname).%(tag)s.key.pem"
   CERT="/systemid/$(hostname).%(tag)s.cert.pem"
@@ -115,16 +115,16 @@ script
     chmod 0400 "${KEY}"
   fi
 
-  chvt 8
+  chvt 9
   /icon/iconograph/client/wait_for_service.py --host=%(host)s --service=%(service)s
-  chvt 8
+  chvt 9
 
   if test ! -s "${CERT}"; then
     openssl req -new -key "${KEY}" -subj "${SUBJECT}" | /icon/certserver/certclient.py --ca-cert=/icon/config/ca.%(tag)s.certserver.cert.pem --client-cert=/icon/config/client.%(tag)s.certserver.cert.pem --client-key=/icon/config/client.%(tag)s.certserver.key.pem --server=%(server)s > "${CERT}"
     chmod 0444 "${CERT}"
   fi
 
-  chvt 8
+  chvt 9
 
   echo
   echo "=================="