github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 13:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1315 from justincormack/hyperkit-commands

Browse Source 
Make the hyperkit script try harder to find executables
This commit is contained in:
Justin Cormack
2017-03-15 16:22:04 +00:00
committed by GitHub
parent 31b9055ac0 57fbdd95cc
commit f2db33dfbb
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/hyperkit.sh
View File

@@ -2,6 +2,19 @@
set -e set -e
DOCKER_HYPERKIT=/Applications/Docker.app/Contents/MacOS/com.docker.hyperkit
DOCKER_VPNKIT=/Applications/Docker.app/Contents/MacOS/vpnkit
[ -f bin/com.docker.hyperkit ] && HYPERKIT=bin/com.docker.hyperkit
[ -f bin/vpnkit ] && VPNKIT=bin/vpnkit
[ -f "$DOCKER_HYPERKIT" ] && HYPERKIT="$DOCKER_HYPERKIT"
[ -f "$DOCKER_VPNKIT" ] && VPNKIT="$DOCKER_VPNKIT"
command -v com.docker.hyperkit > /dev/null && HYPERKIT="$(command -v com.docker.hyperkit)"
command -v hyperkit > /dev/null && HYPERKIT="$(command -v hyperkit)"
command -v vpnkit > /dev/null && VPNKIT="$(command -v vpnkit)"
if [ $# -eq 0 ] if [ $# -eq 0 ]
then then
PREFIX="moby" PREFIX="moby"
@@ -20,6 +33,7 @@ else
CMDLINE=$3 CMDLINE=$3
fi fi
# TODO start vpnkit if Docker for Mac not running
SLIRP_SOCK="$HOME/Library/Containers/com.docker.docker/Data/s50" SLIRP_SOCK="$HOME/Library/Containers/com.docker.docker/Data/s50"
[ -f disk.img ] || dd if=/dev/zero of=disk.img bs=1048576 count=256 [ -f disk.img ] || dd if=/dev/zero of=disk.img bs=1048576 count=256
@@ -32,7 +46,7 @@ PCI_DEV="-s 0:0,hostbridge -s 31,lpc"
RND="-s 5,virtio-rnd" RND="-s 5,virtio-rnd"
LPC_DEV="-l com1,stdio" LPC_DEV="-l com1,stdio"
#bin/vpnkit --ethernet $SLIRP_SOCK &>/dev/null & #$VPNKIT --ethernet $SLIRP_SOCK &>/dev/null &
#trap "kill $!; rm $SLIRP_SOCK" EXIT #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" $HYPERKIT -A $MEM $SMP $PCI_DEV $LPC_DEV $NET $IMG_HDD $RND -u -f kexec,$KERNEL,$INITRD,"$CMDLINE"