mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-22 02:21:34 +00:00
remove 9pinit package, work now done by appropriate packages or mobyconfig tool
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
parent
c1684dd7d0
commit
0acd6c8196
@ -38,7 +38,6 @@ COPY packages/diagnostics/diagnostics-server /usr/bin/
|
|||||||
COPY packages/diagnostics/diagnostics-download /usr/bin/
|
COPY packages/diagnostics/diagnostics-download /usr/bin/
|
||||||
COPY packages/diagnostics/etc /etc/
|
COPY packages/diagnostics/etc /etc/
|
||||||
COPY packages/automount/etc /etc/
|
COPY packages/automount/etc /etc/
|
||||||
COPY packages/9pinit/etc /etc/
|
|
||||||
COPY packages/ntp15m/etc /etc/
|
COPY packages/ntp15m/etc /etc/
|
||||||
COPY packages/binfmt_misc/etc /etc/
|
COPY packages/binfmt_misc/etc /etc/
|
||||||
COPY packages/dnsfix/etc /etc/
|
COPY packages/dnsfix/etc /etc/
|
||||||
@ -85,7 +84,6 @@ RUN \
|
|||||||
rc-update add klogd && \
|
rc-update add klogd && \
|
||||||
rc-update add docker default && \
|
rc-update add docker default && \
|
||||||
rc-update add proxy default && \
|
rc-update add proxy default && \
|
||||||
rc-update add 9pinit boot && \
|
|
||||||
rc-update add transfused default && \
|
rc-update add transfused default && \
|
||||||
rc-update add mdnstool default && \
|
rc-update add mdnstool default && \
|
||||||
rc-update add automount boot && \
|
rc-update add automount boot && \
|
||||||
|
@ -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
|
|
||||||
}
|
|
@ -4,7 +4,6 @@ description="docker config update manager"
|
|||||||
|
|
||||||
depend()
|
depend()
|
||||||
{
|
{
|
||||||
need 9pinit
|
|
||||||
after docker
|
after docker
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -16,7 +15,7 @@ start()
|
|||||||
DOCKERPIDFILE=/run/docker.pid
|
DOCKERPIDFILE=/run/docker.pid
|
||||||
WATCH=$(mobyconfig watch /etc/daemon.json)
|
WATCH=$(mobyconfig watch /etc/daemon.json)
|
||||||
|
|
||||||
[ -z "${WATCH}" && exit 1
|
[ -z "${WATCH}" ] && exit 1
|
||||||
|
|
||||||
start-stop-daemon --start --quiet \
|
start-stop-daemon --start --quiet \
|
||||||
--background \
|
--background \
|
||||||
|
@ -4,7 +4,7 @@ description="mDNS server"
|
|||||||
|
|
||||||
depend()
|
depend()
|
||||||
{
|
{
|
||||||
need 9pinit net
|
need net
|
||||||
after firewall
|
after firewall
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -14,7 +14,7 @@ start()
|
|||||||
|
|
||||||
ebegin "Starting mDNS server"
|
ebegin "Starting mDNS server"
|
||||||
|
|
||||||
[ -n "${PIDFILE}" ] || PIDFILE=/var/run/mdnstool.pid
|
PIDFILE=/var/run/mdnstool.pid
|
||||||
|
|
||||||
hostname -F /etc/hostname
|
hostname -F /etc/hostname
|
||||||
export HOSTNAME=$(hostname -s).local.
|
export HOSTNAME=$(hostname -s).local.
|
||||||
@ -34,7 +34,7 @@ stop()
|
|||||||
|
|
||||||
ebegin "Stopping mDNS server"
|
ebegin "Stopping mDNS server"
|
||||||
|
|
||||||
[ -n "${PIDFILE}" ] || PIDFILE=/var/run/mdnstool.pid
|
PIDFILE=/var/run/mdnstool.pid
|
||||||
|
|
||||||
start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
|
start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
|
||||||
|
|
||||||
|
@ -2,11 +2,6 @@
|
|||||||
|
|
||||||
description="fuse proxy server"
|
description="fuse proxy server"
|
||||||
|
|
||||||
depend()
|
|
||||||
{
|
|
||||||
need 9pinit
|
|
||||||
}
|
|
||||||
|
|
||||||
start()
|
start()
|
||||||
{
|
{
|
||||||
ebegin "Starting FUSE socket passthrough"
|
ebegin "Starting FUSE socket passthrough"
|
||||||
|
Loading…
Reference in New Issue
Block a user