Make the hyperkit script get the kernel command line if just passed a name

This is all slightly annoying, maybe we should make a file for the CLI for
hyperkit, but this is better and fixes a bug that the test CLI was coming from moby,
and is easier to use with custom builds.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-03-15 15:01:47 +00:00
parent 379df0e20d
commit 8427af09c5
2 changed files with 19 additions and 8 deletions

View File

@@ -2,12 +2,23 @@
set -e
PREFIX="moby"
[ $# -ge 1 ] && PREFIX="$1"
KERNEL="$PREFIX-bzImage"
INITRD="$PREFIX-initrd.img"
CMDLINE="$2"
if [ $# -eq 0 ]
then
PREFIX="moby"
KERNEL="$PREFIX-bzImage"
INITRD="$PREFIX-initrd.img"
CMDLINE=$(bin/moby --cmdline ${PREFIX}.yaml)
elif [ $# -eq 1 ]
then
PREFIX="$1"
KERNEL="$PREFIX-bzImage"
INITRD="$PREFIX-initrd.img"
CMDLINE=$(bin/moby --cmdline ${PREFIX}.yaml)
else
KERNEL=$1
INITRD=$2
CMDLINE=$3
fi
SLIRP_SOCK="$HOME/Library/Containers/com.docker.docker/Data/s50"