Fix hyperkit script to use correct command line

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-03-20 15:51:33 +00:00
parent 3e3adea1cc
commit 76cb22f927

View File

@ -20,13 +20,13 @@ then
PREFIX="moby" PREFIX="moby"
KERNEL="$PREFIX-bzImage" KERNEL="$PREFIX-bzImage"
INITRD="$PREFIX-initrd.img" INITRD="$PREFIX-initrd.img"
CMDLINE="$PREFIX-cmdline" CMDLINE="$(cat $PREFIX-cmdline)"
elif [ $# -eq 1 ] elif [ $# -eq 1 ]
then then
PREFIX="$1" PREFIX="$1"
KERNEL="$PREFIX-bzImage" KERNEL="$PREFIX-bzImage"
INITRD="$PREFIX-initrd.img" INITRD="$PREFIX-initrd.img"
CMDLINE="$PREFIX-cmdline" CMDLINE="$(cat $PREFIX-cmdline)"
else else
KERNEL=$1 KERNEL=$1
INITRD=$2 INITRD=$2
@ -49,4 +49,4 @@ LPC_DEV="-l com1,stdio"
#$VPNKIT --ethernet $SLIRP_SOCK &>/dev/null & #$VPNKIT --ethernet $SLIRP_SOCK &>/dev/null &
#trap "kill $!; rm $SLIRP_SOCK" EXIT #trap "kill $!; rm $SLIRP_SOCK" EXIT
$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"