diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 285dc7ab8..d287ea157 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -23,8 +23,8 @@ COPY mkinitrd.sh /bin/ COPY packages/9pudc/9pudc /sbin/ COPY packages/9pudc/etc /etc/ -COPY packages/9pudfuse/9pudfuse /sbin/ -COPY packages/9pudfuse/etc /etc/ +COPY packages/transfused/transfused /sbin/ +COPY packages/transfused/etc /etc/ COPY packages/mdnstool/mdnstool /sbin/ COPY packages/mdnstool/etc /etc/ COPY packages/docker/docker /usr/bin/ @@ -78,7 +78,7 @@ RUN \ rc-update add docker default && \ rc-update add 9pinit boot && \ rc-update add 9pudc default && \ - rc-update add 9pudfuse default && \ + rc-update add transfused default && \ rc-update add mdnstool default && \ rc-update add automount boot && \ rc-update add diagnostics default && \ diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile index 995805a3e..014f78c59 100644 --- a/alpine/packages/Makefile +++ b/alpine/packages/Makefile @@ -1,6 +1,6 @@ all: $(MAKE) -C 9pudc - $(MAKE) -C 9pudfuse + $(MAKE) -C transfused $(MAKE) -C mdnstool $(MAKE) -C docker $(MAKE) -C hupper @@ -8,14 +8,14 @@ all: arm: $(MAKE) -C 9pudc ARCH=arm - $(MAKE) -C 9pudfuse ARCH=arm + $(MAKE) -C transfused ARCH=arm $(MAKE) -C mdnstool ARCH=arm $(MAKE) -C docker ARCH=arm $(MAKE) -C hupper ARCH=arm clean: $(MAKE) -C 9pudc clean - $(MAKE) -C 9pudfuse clean + $(MAKE) -C transfused clean $(MAKE) -C mdnstool clean $(MAKE) -C docker clean $(MAKE) -C hupper clean diff --git a/alpine/packages/diagnostics/diagnostics b/alpine/packages/diagnostics/diagnostics index 5ed2299e6..b81f24733 100755 --- a/alpine/packages/diagnostics/diagnostics +++ b/alpine/packages/diagnostics/diagnostics @@ -11,8 +11,8 @@ UDC=$(ps -eo args | grep '^/sbin/9pudc') [ $? -eq 0 ] && printf "✓ Process 9pudc running: $UDC\n" || printf "✗ No 9pudc process\n" if [ -d /Transfuse ] then - FUSE=$(ps -eo args | grep '^/sbin/9pudfuse') - [ $? -eq 0 ] && printf "✓ Process 9pudfuse running\n" || printf "✗ No 9pudfuse process\n" + FUSE=$(ps -eo args | grep '^/sbin/transfused') + [ $? -eq 0 ] && printf "✓ Process transfused running\n" || printf "✗ No transfused process\n" fi MDNS=$(ps -eo args | grep '^/sbin/mdnstool') [ $? -eq 0 ] && printf "✓ Process mdnstool running: $MDNS\n" || printf "✗ No mdnstool process\n" diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 19231e9c5..90e6e725f 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -27,6 +27,6 @@ start_stop_daemon_args="--background \ depend() { - after 9pudc 9pudfuse + after 9pudc transfused before chronyd } diff --git a/alpine/packages/hostlog/etc/init.d/hostlog b/alpine/packages/hostlog/etc/init.d/hostlog index b0e19cca5..f773ac8c0 100755 --- a/alpine/packages/hostlog/etc/init.d/hostlog +++ b/alpine/packages/hostlog/etc/init.d/hostlog @@ -3,7 +3,7 @@ depends() { before acpid docker syslog chronyd - after 9pinit 9pudfuse + after 9pinit transfused } start() diff --git a/xhyve/fuserun.sh b/xhyve/fuserun.sh index 3e57f2309..60742f031 100755 --- a/xhyve/fuserun.sh +++ b/xhyve/fuserun.sh @@ -17,7 +17,7 @@ fi #IMG_HDD="-s 4,virtio-blk,/somepath/somefile.img" PCI_DEV="-s 0:0,hostbridge -s 31,lpc" 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" ACPI="-A" CLOCK="-u"