From 407eba8daaed6d846671f05d1e599b75bffd0a60 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Thu, 17 Mar 2016 12:27:20 +0000
Subject: [PATCH] move hostlog into 9pinit so it happens early enough to
 capture logs

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 alpine/Dockerfile                          |  2 --
 alpine/packages/9pinit/etc/init.d/9pinit   |  6 ++++++
 alpine/packages/hostlog/etc/init.d/hostlog | 20 --------------------
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100755 alpine/packages/hostlog/etc/init.d/hostlog

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index c20300b28..7549cf290 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -42,7 +42,6 @@ COPY packages/dnsfix/etc /etc/
 COPY packages/database/etc /etc/
 COPY packages/hupper/hupper /bin/
 COPY packages/hupper/etc /etc/
-COPY packages/hostlog/etc /etc/
 COPY packages/hvtools/hv_fcopy_daemon /sbin/
 COPY packages/hvtools/hv_kvp_daemon /sbin/
 COPY packages/hvtools/hv_vss_daemon /sbin/
@@ -88,7 +87,6 @@ RUN \
   rc-update add dnsfix boot && \
   rc-update add database boot && \
   rc-update add hupper default && \
-  rc-update add hostlog default && \
   rc-update add hv_fcopy_daemon default && \
   rc-update add hv_kvp_daemon default && \
   rc-update add hv_vss_daemon default && \
diff --git a/alpine/packages/9pinit/etc/init.d/9pinit b/alpine/packages/9pinit/etc/init.d/9pinit
index 13a618bef..0b04b6f52 100755
--- a/alpine/packages/9pinit/etc/init.d/9pinit
+++ b/alpine/packages/9pinit/etc/init.d/9pinit
@@ -28,5 +28,11 @@ start()
 
 	done
 
+	if cat /proc/cmdline | grep -q 'com.docker.driverDir'
+	then
+		DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')"
+		mount --bind "${DRIVERDIR}/log" /var/log
+	fi 
+
         eend 0
 }
diff --git a/alpine/packages/hostlog/etc/init.d/hostlog b/alpine/packages/hostlog/etc/init.d/hostlog
deleted file mode 100755
index 4b36e713f..000000000
--- a/alpine/packages/hostlog/etc/init.d/hostlog
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-depends()
-{
-	before acpid docker syslog chronyd
-	after 9pinit transfused
-}
-
-start()
-{
-	cat /proc/cmdline | grep -q 'com.docker.driverDir' || exit 0
-
-	ebegin "Redirecting logs to host"
-
-	DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')"
-
-	mount --bind "${DRIVERDIR}/log" /var/log
- 
-	eend $? "Failed to redirect logs to host"
-}