From fa4f1aaedc8e5454730ad0d4a7a2eb8e306603ed Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Wed, 25 Jan 2017 15:10:35 +0000
Subject: [PATCH] Start diagnostics server earlier, before Docker

Allows it to be used to see what the boot state is.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 alpine/Dockerfile                             |  1 +
 .../diagnostics/etc/init.d/diagnostics        | 23 --------------
 .../diagnostics/etc/init.d/diagnostics-server | 30 +++++++++++++++++++
 .../packages/diagnostics/usr/bin/diagnostics  |  1 -
 4 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100755 alpine/packages/diagnostics/etc/init.d/diagnostics-server

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index ad92f9237..f9a9d1e8d 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -43,6 +43,7 @@ RUN \
   rc-update add transfused default && \
   rc-update add automount sysinit && \
   rc-update add diagnostics default && \
+  rc-update add diagnostics-server boot && \
   rc-update add database-mac boot && \
   rc-update add database-windows boot && \
   rc-update add database-aws default && \
diff --git a/alpine/packages/diagnostics/etc/init.d/diagnostics b/alpine/packages/diagnostics/etc/init.d/diagnostics
index 13f69ed29..5acd997b3 100755
--- a/alpine/packages/diagnostics/etc/init.d/diagnostics
+++ b/alpine/packages/diagnostics/etc/init.d/diagnostics
@@ -7,28 +7,5 @@ depend()
 
 start()
 {
-	ebegin "Checking system state"
-
-	DIAGNOSTICS_SERVER_FLAGS=""
-
-	case "$(mobyplatform)" in
-		"aws")
-			DIAGNOSTICS_SERVER_FLAGS="-http"
-		;;
-		"azure")
-			DIAGNOSTICS_SERVER_FLAGS="-http"
-		;;
-		"gcp")
-			DIAGNOSTICS_SERVER_FLAGS="-http"
-		;;
-		"windows")
-			DIAGNOSTICS_SERVER_FLAGS="-hvsock"
-		;;
-		"mac")
-			DIAGNOSTICS_SERVER_FLAGS="-vsock"
-		;;
-	esac
-
-	/usr/bin/diagnostics-server ${DIAGNOSTICS_SERVER_FLAGS} &
 	/usr/bin/diagnostics
 }
diff --git a/alpine/packages/diagnostics/etc/init.d/diagnostics-server b/alpine/packages/diagnostics/etc/init.d/diagnostics-server
new file mode 100755
index 000000000..10af04666
--- /dev/null
+++ b/alpine/packages/diagnostics/etc/init.d/diagnostics-server
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+
+start()
+{
+	ebegin "Starting diagnostics server"
+
+	DIAGNOSTICS_SERVER_FLAGS=""
+
+	case "$(mobyplatform)" in
+		"aws")
+			DIAGNOSTICS_SERVER_FLAGS="-http"
+		;;
+		"azure")
+			DIAGNOSTICS_SERVER_FLAGS="-http"
+		;;
+		"gcp")
+			DIAGNOSTICS_SERVER_FLAGS="-http"
+		;;
+		"windows")
+			DIAGNOSTICS_SERVER_FLAGS="-hvsock"
+		;;
+		"mac")
+			DIAGNOSTICS_SERVER_FLAGS="-vsock"
+		;;
+	esac
+
+	/usr/bin/diagnostics-server ${DIAGNOSTICS_SERVER_FLAGS} &
+
+	eend 0
+}
diff --git a/alpine/packages/diagnostics/usr/bin/diagnostics b/alpine/packages/diagnostics/usr/bin/diagnostics
index 03ed450d9..eb137765d 100755
--- a/alpine/packages/diagnostics/usr/bin/diagnostics
+++ b/alpine/packages/diagnostics/usr/bin/diagnostics
@@ -13,7 +13,6 @@ ok()
 	printf "✓ $1"
 }
 
-printf '\n'
 DEV="$(find /dev -maxdepth 1 -type b ! -name 'loop*' | grep -v '[0-9]$' | sed 's@.*/dev/@@' | head -1 )"
 [ $? -eq 0 ] && ok "Drive found: $DEV\n" || fail "No drive found\n"
 DEV=$(mount | grep '/dev/.* on /var type')