From 4ffd42e4f0d67efdb18ad326ff401d3364ee542c Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 28 Feb 2017 17:52:38 -0800 Subject: [PATCH] slirp binary renamed to vpnkit Recently com.docker.slirp was renamed. Please update Docker for Mac before using this script... Signed-off-by: Justin Cormack --- Makefile | 12 ++++++------ scripts/hyperkit.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2276e6cca..50762ae48 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ bin: mkdir -p $@ DOCKER_HYPERKIT=/Applications/Docker.app/Contents/MacOS/com.docker.hyperkit -DOCKER_SLIRP=/Applications/Docker.app/Contents/MacOS/com.docker.slirp +DOCKER_VPNKIT=/Applications/Docker.app/Contents/MacOS/vpnkit bin/com.docker.hyperkit: | bin ifneq ("$(wildcard $(DOCKER_HYPERKIT))","") @@ -56,12 +56,12 @@ else chmod a+x $@ endif -bin/com.docker.slirp: | bin -ifneq ("$(wildcard $(DOCKER_SLIRP))","") - ln -s $(DOCKER_SLIRP) $@ +bin/vpnkit: | bin +ifneq ("$(wildcard $(DOCKER_VPNKIT))","") + ln -s $(DOCKER_VPNKIT) $@ else - curl -fsSL https://circleci.com/api/v1/project/docker/vpnkit/latest/artifacts/0//Users/distiller/vpnkit/com.docker.slirp.tgz \ - | tar xz --strip=2 -C $(dir $@) Contents/MacOS/com.docker.slirp + curl -fsSL https://circleci.com/api/v1/project/docker/vpnkit/latest/artifacts/0//Users/distiller/vpnkit/vpnkit.tgz \ + | tar xz --strip=2 -C $(dir $@) Contents/MacOS/vpnkit touch $@ endif diff --git a/scripts/hyperkit.sh b/scripts/hyperkit.sh index 330a04109..deb233086 100755 --- a/scripts/hyperkit.sh +++ b/scripts/hyperkit.sh @@ -17,7 +17,7 @@ PCI_DEV="-s 0:0,hostbridge -s 31,lpc" RND="-s 5,virtio-rnd" LPC_DEV="-l com1,stdio" -bin/com.docker.slirp --ethernet $SLIRP_SOCK &>/dev/null & +bin/vpnkit --ethernet $SLIRP_SOCK &>/dev/null & trap "kill $!; rm $SLIRP_SOCK" EXIT bin/com.docker.hyperkit -A $MEM $SMP $PCI_DEV $LPC_DEV $NET $IMG_HDD $RND -u -f kexec,$KERNEL,$INITRD,"$CMDLINE"