From e8b5cdea294c352c06a014d1be1e422f2d191435 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@gmail.com>
Date: Thu, 7 Apr 2016 01:00:40 +0000
Subject: [PATCH] init style cleanup

---
 server/modules/autoimage.py  | 19 +++++++++----------
 server/modules/persistent.py |  4 ++++
 server/modules/systemid.py   |  4 ++++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/server/modules/autoimage.py b/server/modules/autoimage.py
index 79fbfaa..a91cd70 100755
--- a/server/modules/autoimage.py
+++ b/server/modules/autoimage.py
@@ -109,23 +109,22 @@ def main():
     fh.write("""
 description "AutoImage"
 
-start on stopped rc RUNLEVEL=[2345]
-
-stop on runlevel [!2345]
+start on runlevel [2345]
 
 script
+  exec </dev/tty7 >/dev/tty7 2>&1
   chvt 7
-  /autoimage/client/wait_for_service.py --host=%(host)s --service=%(service)s </dev/tty7 >/dev/tty7 2>&1
+  /autoimage/client/wait_for_service.py --host=%(host)s --service=%(service)s
   chvt 7
-  /autoimage/imager/image.py --device=%(device)s --persistent-percent=%(persistent_percent)d --ca-cert=/autoimage/config/ca.cert.pem --base-url=%(base_url)s %(image_flags)s </dev/tty7 >/dev/tty7 2>&1
+  /autoimage/imager/image.py --device=%(device)s --persistent-percent=%(persistent_percent)d --ca-cert=/autoimage/config/ca.cert.pem --base-url=%(base_url)s %(image_flags)s
   chvt 7
 
-  echo >/dev/tty7
-  echo "==================" >/dev/tty7
-  echo "autoimage complete" >/dev/tty7
-  echo "==================" >/dev/tty7
+  echo
+  echo "=================="
+  echo "autoimage complete"
+  echo "=================="
 
-  /autoimage/client/alert.py --type=happy </dev/tty7 >/dev/tty7
+  /autoimage/client/alert.py --type=happy
 end script
 """ % {
       'host': parsed.hostname,
diff --git a/server/modules/persistent.py b/server/modules/persistent.py
index 1b30e91..1448507 100755
--- a/server/modules/persistent.py
+++ b/server/modules/persistent.py
@@ -22,9 +22,13 @@ def main():
 description "Mount /persistent"
 
 start on filesystem
+task
+
+emits persistent-ready
 
 script
   mount LABEL=PERSISTENT /persistent
+  initctl emit --no-wait persistent-ready
 end script
 """)
 
diff --git a/server/modules/systemid.py b/server/modules/systemid.py
index d496d3e..8159c54 100755
--- a/server/modules/systemid.py
+++ b/server/modules/systemid.py
@@ -22,6 +22,9 @@ def main():
 description "Mount /systemid"
 
 start on filesystem
+task
+
+emits systemid-ready
 
 script
   mount LABEL=SYSTEMID /systemid
@@ -29,6 +32,7 @@ script
   echo ${SYSTEMID} > /etc/hostname
   hostname --file /etc/hostname
   grep ${SYSTEMID} /etc/hosts >/dev/null || echo "127.0.2.1 ${SYSTEMID}" >> /etc/hosts
+  initctl emit --no-wait systemid-ready
 end script
 """)