From b042b5127f25dd417c2bc82364ea5576abf84ba6 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Sat, 12 Nov 2016 15:26:33 +0000
Subject: [PATCH] Revert "Format filesystems earlier, before syslog"

This reverts commit 4dd5dca106a3238d057effbd4b80b05d881f731b.

Fix #710 where system hangs after klogd startup on AWS. Possibly
also affects Windows too. Still unclear why but lets revert and
continue investif=gating.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 alpine/Dockerfile                              |  3 ++-
 alpine/etc/init.d/fsck                         | 12 ------------
 alpine/packages/automount/etc/init.d/automount |  3 ++-
 3 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100755 alpine/etc/init.d/fsck

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index a47e4e69f..a8b0236c3 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -35,13 +35,14 @@ RUN \
   rc-update add sysfs && \
   rc-update add sysfsconf && \
   rc-update add fsck && \
+  rc-update add root && \
   rc-update add crond && \
   rc-update add local && \
   rc-update add localmount && \
   rc-update add docker default && \
   rc-update add proxy default && \
   rc-update add transfused default && \
-  rc-update add automount sysinit && \
+  rc-update add automount boot && \
   rc-update add diagnostics default && \
   rc-update add binfmt_misc default && \
   rc-update add hostsettings default && \
diff --git a/alpine/etc/init.d/fsck b/alpine/etc/init.d/fsck
deleted file mode 100755
index 5a82b6aaa..000000000
--- a/alpine/etc/init.d/fsck
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# do nothing as we do this in automount script
-
-start()
-{
-	return 0
-}
-
-stop()
-{
-	return 0
-}
diff --git a/alpine/packages/automount/etc/init.d/automount b/alpine/packages/automount/etc/init.d/automount
index 07a037bce..43f1f7cb6 100755
--- a/alpine/packages/automount/etc/init.d/automount
+++ b/alpine/packages/automount/etc/init.d/automount
@@ -2,7 +2,8 @@
 
 depend()
 {
-	need dev
+	after dev
+	before docker
 }
 
 start()