From 0acd6c81969a9cf559e8f07cc1858bddbf247165 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Thu, 7 Apr 2016 16:40:54 +0100
Subject: [PATCH] remove 9pinit package, work now done by appropriate packages
 or mobyconfig tool

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

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 4ae7587fa..eac1d39c9 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -38,7 +38,6 @@ COPY packages/diagnostics/diagnostics-server /usr/bin/
 COPY packages/diagnostics/diagnostics-download /usr/bin/
 COPY packages/diagnostics/etc /etc/
 COPY packages/automount/etc /etc/
-COPY packages/9pinit/etc /etc/
 COPY packages/ntp15m/etc /etc/
 COPY packages/binfmt_misc/etc /etc/
 COPY packages/dnsfix/etc /etc/
@@ -85,7 +84,6 @@ RUN \
   rc-update add klogd && \
   rc-update add docker default && \
   rc-update add proxy default && \
-  rc-update add 9pinit boot && \
   rc-update add transfused default && \
   rc-update add mdnstool default && \
   rc-update add automount boot && \
diff --git a/alpine/packages/9pinit/etc/init.d/9pinit b/alpine/packages/9pinit/etc/init.d/9pinit
deleted file mode 100755
index 07ed5807a..000000000
--- a/alpine/packages/9pinit/etc/init.d/9pinit
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-start()
-{
-	ebegin "Mounting 9p sockets"
-
-	for virtio in $(find /sys/bus/virtio/drivers/9pnet_virtio -name 'virtio*')	
-	do
-		TAG=$(cat $virtio/mount_tag)
-		case $TAG in
-		"db")
-			mkdir -p /Database
-			mount -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 db /Database
-			;;
-		esac
-
-	done
-
-        eend 0
-}
diff --git a/alpine/packages/hupper/etc/init.d/hupper b/alpine/packages/hupper/etc/init.d/hupper
index e7e010938..21cfbfc07 100755
--- a/alpine/packages/hupper/etc/init.d/hupper
+++ b/alpine/packages/hupper/etc/init.d/hupper
@@ -4,7 +4,6 @@ description="docker config update manager"
 
 depend()
 {
-	need 9pinit
 	after docker
 }
 
@@ -16,7 +15,7 @@ start()
 	DOCKERPIDFILE=/run/docker.pid
 	WATCH=$(mobyconfig watch /etc/daemon.json)
 
-	[ -z "${WATCH}" && exit 1
+	[ -z "${WATCH}" ] && exit 1
 
 	start-stop-daemon --start --quiet \
 		--background \
diff --git a/alpine/packages/mdnstool/etc/init.d/mdnstool b/alpine/packages/mdnstool/etc/init.d/mdnstool
index c20212b38..76e1405b0 100755
--- a/alpine/packages/mdnstool/etc/init.d/mdnstool
+++ b/alpine/packages/mdnstool/etc/init.d/mdnstool
@@ -4,7 +4,7 @@ description="mDNS server"
 
 depend()
 {
-        need 9pinit net
+        need net
 	after firewall
 }
 
@@ -14,7 +14,7 @@ start()
 
         ebegin "Starting mDNS server"
 
-	[ -n "${PIDFILE}" ] || PIDFILE=/var/run/mdnstool.pid
+	PIDFILE=/var/run/mdnstool.pid
 
 	hostname -F /etc/hostname
 	export HOSTNAME=$(hostname -s).local.
@@ -34,7 +34,7 @@ stop()
 
         ebegin "Stopping mDNS server"
 
-	[ -n "${PIDFILE}" ] || PIDFILE=/var/run/mdnstool.pid
+	PIDFILE=/var/run/mdnstool.pid
 
 	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
 
diff --git a/alpine/packages/transfused/etc/init.d/transfused b/alpine/packages/transfused/etc/init.d/transfused
index b480ea745..3b5ae5017 100755
--- a/alpine/packages/transfused/etc/init.d/transfused
+++ b/alpine/packages/transfused/etc/init.d/transfused
@@ -2,11 +2,6 @@
 
 description="fuse proxy server"
 
-depend()
-{
-	need 9pinit
-}
-
 start()
 {
 	ebegin "Starting FUSE socket passthrough"