From b3a82885ba2dcf6434bb2d29e6ad45b6b907f979 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 17 Feb 2016 10:35:10 +0000
Subject: [PATCH] hvtools: tweak startup sequence

- Don't start hv_fcopy_daemon. It seems to exit and we are not
  using it anyway. Also, remove it from the initrd

- Move hv_kvp_daemon and hv_vss_daemon to start earlier
  (before networking and docker being started)

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 alpine/Dockerfile                             |  4 +--
 .../hvtools/etc/init.d/hv_fcopy_daemon        | 32 -------------------
 .../packages/hvtools/etc/init.d/hv_kvp_daemon |  6 ++++
 .../packages/hvtools/etc/init.d/hv_vss_daemon |  5 +++
 4 files changed, 12 insertions(+), 35 deletions(-)
 delete mode 100755 alpine/packages/hvtools/etc/init.d/hv_fcopy_daemon

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index cb219602f..9209def5b 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -35,8 +35,7 @@ COPY packages/mdnstool/mdnstool /sbin/
 COPY packages/mdnstool/etc /etc/
 COPY packages/llmnrd/llmnrd /sbin/
 COPY packages/llmnrd/etc /etc/
-COPY packages/docker/docker /usr/bin/
-COPY packages/docker/docker-* /usr/bin/
+COPY packages/docker/bin/* /usr/bin/
 COPY packages/docker/etc /etc/
 COPY packages/diagnostics/diagnostics /usr/bin/
 COPY packages/diagnostics/diagnostics-server /usr/bin/
@@ -49,7 +48,6 @@ COPY packages/dnsfix/etc /etc/
 COPY packages/hostsettings/etc /etc/
 COPY packages/hupper/hupper /bin/
 COPY packages/hupper/etc /etc/
-COPY packages/hvtools/hv_fcopy_daemon /sbin/
 COPY packages/hvtools/hv_kvp_daemon /sbin/
 COPY packages/hvtools/hv_vss_daemon /sbin/
 COPY packages/hvtools/etc /etc/
diff --git a/alpine/packages/hvtools/etc/init.d/hv_fcopy_daemon b/alpine/packages/hvtools/etc/init.d/hv_fcopy_daemon
deleted file mode 100755
index 0d8869710..000000000
--- a/alpine/packages/hvtools/etc/init.d/hv_fcopy_daemon
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-
-HV_DAEMON=hv_fcopy_daemon
-
-start()
-{
-        [ ! -d /sys/bus/vmbus ] && exit 0
-
-        ebegin "Starting Hyper-V Daemon: ${HV_DAEMON}"
-
-        [ -n "${PIDFILE}" ] || PIDFILE=/var/run/${HV_DAEMON}.pid
-
-        start-stop-daemon --start --quiet \
-                --background \
-                --exec /sbin/${HV_DAEMON} \
-                --make-pidfile --pidfile ${PIDFILE} \
-                --
-        eend 0
-}
-
-stop()
-{
-        [ ! -d /sys/bus/vmbus ] && exit 0
-
-        ebegin "Stopping Hyper-V Daemon: ${HV_DAEMON}"
-
-        [ -n "${PIDFILE}" ] || PIDFILE=/var/run/${HV_DAEMON}.pid
-
-        start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-
-        eend $? "Failed to stop ${HV_DAEMON}"
-}
\ No newline at end of file
diff --git a/alpine/packages/hvtools/etc/init.d/hv_kvp_daemon b/alpine/packages/hvtools/etc/init.d/hv_kvp_daemon
index e9a3ae2df..2e1f51c0e 100755
--- a/alpine/packages/hvtools/etc/init.d/hv_kvp_daemon
+++ b/alpine/packages/hvtools/etc/init.d/hv_kvp_daemon
@@ -2,6 +2,12 @@
 
 HV_DAEMON=hv_kvp_daemon
 
+depend()
+{
+        after dev
+        needs networking
+}
+
 start()
 {
         [ ! -d /sys/bus/vmbus ] && exit 0
diff --git a/alpine/packages/hvtools/etc/init.d/hv_vss_daemon b/alpine/packages/hvtools/etc/init.d/hv_vss_daemon
index c001c3392..498a76cdd 100755
--- a/alpine/packages/hvtools/etc/init.d/hv_vss_daemon
+++ b/alpine/packages/hvtools/etc/init.d/hv_vss_daemon
@@ -2,6 +2,11 @@
 
 HV_DAEMON=hv_vss_daemon
 
+depend()
+{
+        after dev
+}
+
 start()
 {
         [ ! -d /sys/bus/vmbus ] && exit 0