github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Replace 9pudfuse with transfused

Browse Source
This commit is contained in:
David Sheets 2016-02-10 10:05:44 +00:00
parent 9a9e35b4ba
commit 192c90b0a7
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alpine/Dockerfile
View File

@ -23,8 +23,8 @@ COPY mkinitrd.sh /bin/
COPY packages/9pudc/9pudc /sbin/ COPY packages/9pudc/9pudc /sbin/
COPY packages/9pudc/etc /etc/ COPY packages/9pudc/etc /etc/
COPY packages/9pudfuse/9pudfuse /sbin/ COPY packages/transfused/transfused /sbin/
COPY packages/9pudfuse/etc /etc/ COPY packages/transfused/etc /etc/
COPY packages/mdnstool/mdnstool /sbin/ COPY packages/mdnstool/mdnstool /sbin/
COPY packages/mdnstool/etc /etc/ COPY packages/mdnstool/etc /etc/
COPY packages/docker/docker /usr/bin/ COPY packages/docker/docker /usr/bin/
@ -78,7 +78,7 @@ RUN \
rc-update add docker default && \ rc-update add docker default && \
rc-update add 9pinit boot && \ rc-update add 9pinit boot && \
rc-update add 9pudc default && \ rc-update add 9pudc default && \
rc-update add 9pudfuse 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 && \
rc-update add diagnostics default && \ rc-update add diagnostics default && \

6
alpine/packages/Makefile
View File

@ -1,6 +1,6 @@
all: all:
$(MAKE) -C 9pudc $(MAKE) -C 9pudc
$(MAKE) -C 9pudfuse $(MAKE) -C transfused
$(MAKE) -C mdnstool $(MAKE) -C mdnstool
$(MAKE) -C docker $(MAKE) -C docker
$(MAKE) -C hupper $(MAKE) -C hupper
@ -8,14 +8,14 @@ all:
arm: arm:
$(MAKE) -C 9pudc ARCH=arm $(MAKE) -C 9pudc ARCH=arm
$(MAKE) -C 9pudfuse ARCH=arm $(MAKE) -C transfused ARCH=arm
$(MAKE) -C mdnstool ARCH=arm $(MAKE) -C mdnstool ARCH=arm
$(MAKE) -C docker ARCH=arm $(MAKE) -C docker ARCH=arm
$(MAKE) -C hupper ARCH=arm $(MAKE) -C hupper ARCH=arm
clean: clean:
$(MAKE) -C 9pudc clean $(MAKE) -C 9pudc clean
$(MAKE) -C 9pudfuse clean $(MAKE) -C transfused clean
$(MAKE) -C mdnstool clean $(MAKE) -C mdnstool clean
$(MAKE) -C docker clean $(MAKE) -C docker clean
$(MAKE) -C hupper clean $(MAKE) -C hupper clean

4
alpine/packages/diagnostics/diagnostics
View File

@ -11,8 +11,8 @@ UDC=$(ps -eo args | grep '^/sbin/9pudc')
[ $? -eq 0 ] && printf "✓ Process 9pudc running: $UDC\n" || printf "✗ No 9pudc process\n" [ $? -eq 0 ] && printf "✓ Process 9pudc running: $UDC\n" || printf "✗ No 9pudc process\n"
if [ -d /Transfuse ] if [ -d /Transfuse ]
then then
FUSE=$(ps -eo args | grep '^/sbin/9pudfuse') FUSE=$(ps -eo args | grep '^/sbin/transfused')
[ $? -eq 0 ] && printf "✓ Process 9pudfuse running\n" || printf "✗ No 9pudfuse process\n" [ $? -eq 0 ] && printf "✓ Process transfused running\n" || printf "✗ No transfused process\n"
fi fi
MDNS=$(ps -eo args | grep '^/sbin/mdnstool') MDNS=$(ps -eo args | grep '^/sbin/mdnstool')
[ $? -eq 0 ] && printf "✓ Process mdnstool running: $MDNS\n" || printf "✗ No mdnstool process\n" [ $? -eq 0 ] && printf "✓ Process mdnstool running: $MDNS\n" || printf "✗ No mdnstool process\n"

2
alpine/packages/docker/etc/init.d/docker
View File

@ -27,6 +27,6 @@ start_stop_daemon_args="--background \
depend() depend()
{ {
after 9pudc 9pudfuse after 9pudc transfused
before chronyd before chronyd
} }

2
alpine/packages/hostlog/etc/init.d/hostlog
View File

@ -3,7 +3,7 @@
depends() depends()
{ {
before acpid docker syslog chronyd before acpid docker syslog chronyd
after 9pinit 9pudfuse after 9pinit transfused
} }
start() start()

2
xhyve/fuserun.sh
View File

@ -17,7 +17,7 @@ fi
#IMG_HDD="-s 4,virtio-blk,/somepath/somefile.img" #IMG_HDD="-s 4,virtio-blk,/somepath/somefile.img"
PCI_DEV="-s 0:0,hostbridge -s 31,lpc" PCI_DEV="-s 0:0,hostbridge -s 31,lpc"
RND="-s 5,virtio-rnd" RND="-s 5,virtio-rnd"
FS="-s 6,virtio-9p,path=9pudfuse.sock,tag=fuse" FS="-s 6,virtio-9p,path=transfused.sock,tag=fuse"
LPC_DEV="-l com1,stdio" LPC_DEV="-l com1,stdio"
ACPI="-A" ACPI="-A"
CLOCK="-u" CLOCK="-u"