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>
This commit is contained in:
Rolf Neugebauer 2016-02-17 10:35:10 +00:00
parent 73a0d1671e
commit b3a82885ba
4 changed files with 12 additions and 35 deletions

View File

@ -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/

View File

@ -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}"
}

View File

@ -2,6 +2,12 @@
HV_DAEMON=hv_kvp_daemon
depend()
{
after dev
needs networking
}
start()
{
[ ! -d /sys/bus/vmbus ] && exit 0

View File

@ -2,6 +2,11 @@
HV_DAEMON=hv_vss_daemon
depend()
{
after dev
}
start()
{
[ ! -d /sys/bus/vmbus ] && exit 0