github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-02 15:37:11 +00:00
Code Issues Projects Releases Wiki Activity

hoist kernel cmdline into moby.yaml

Browse Source 
Signed-off-by: Tycho Andersen <tycho@docker.com>
This commit is contained in:
Tycho Andersen
2017-03-08 11:09:31 -08:00
parent 8a3ae66f64
commit a383e6bb46
12 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/hyperkit.sh
View File

@@ -7,8 +7,7 @@ PREFIX="moby"
KERNEL="$PREFIX-bzImage"
INITRD="$PREFIX-initrd.img"
CMDLINE="earlyprintk=serial console=ttyS0"
CMDLINE="$2"
SLIRP_SOCK="$HOME/Library/Containers/com.docker.docker/Data/s50"

3
scripts/qemu.sh
View File

@@ -12,6 +12,7 @@ fi
FILE=$1
FILE2=$2
CMDLINE=$3
[ -z "$FILE" ] && FILE="$PWD/moby"
BASE=$(basename "$FILE")
@@ -32,4 +33,4 @@ BASE=$(basename "$FILE")
MOUNTS="-v $FILE:/tmp/$BASE"
BASE2=$(basename "$FILE2")
[ ! -z "$FILE2" ] && MOUNTS="$MOUNTS -v $FILE2:/tmp/$BASE2"
docker run -it --rm $MOUNTS "$QEMU_IMAGE" console=ttyS0
docker run -it --rm $MOUNTS "$QEMU_IMAGE" $CMDLINE