github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1517 from samoht/make-qemu

Browse Source 
Really fix `make qemu`
This commit is contained in:
Justin Cormack 2017-04-06 15:14:22 +01:00 committed by GitHub
commit 40cc6d8110
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/qemu.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
QEMU_IMAGE=mobylinux/qemu:ac2f8d3258d09541f0dab7529f62bb7e9b9bb79c@sha256:b60d1421937b0ebf4846341a1cda1ca00f44a45553d5494080b2ca8aac468773 QEMU_IMAGE=mobylinux/qemu:e8d64debb343de87d66aafb21502808409600a04@sha256:e84e13549a9b5f6959bea258356995722ed5c8c477a9064ef747c32bc5a97917
# if not interactive # if not interactive
if [ ! -t 0 -a -z "$1" ] if [ ! -t 0 -a -z "$1" ]
@ -28,6 +28,10 @@ if [ ! -z "$FILE2" ]
then then
echo "$FILE2" | grep -q '^/' || FILE2="$PWD/$FILE2" echo "$FILE2" | grep -q '^/' || FILE2="$PWD/$FILE2"
fi fi
if [ ! -z "$CMDLINE" ]
then
echo "$CMDLINE" | grep -q '^/' || CMDLINE="$PWD/$CMDLINE"
fi
if [ -c "/dev/kvm" ] ; then if [ -c "/dev/kvm" ] ; then
DEVKVM="--device=/dev/kvm" DEVKVM="--device=/dev/kvm"
@ -35,5 +39,9 @@ fi
BASE=$(basename "$FILE") BASE=$(basename "$FILE")
MOUNTS="-v $FILE:/tmp/$BASE" MOUNTS="-v $FILE:/tmp/$BASE"
BASE2=$(basename "$FILE2") BASE2=$(basename "$FILE2")
BASE3=$(basename "$CMDLINE")
[ ! -z "$FILE2" ] && MOUNTS="$MOUNTS -v $FILE2:/tmp/$BASE2" [ ! -z "$FILE2" ] && MOUNTS="$MOUNTS -v $FILE2:/tmp/$BASE2"
docker run -it --rm $MOUNTS $DEVKVM "$QEMU_IMAGE" $CMDLINE [ ! -z "$CMDLINE" ] && MOUNTS="$MOUNTS -v $CMDLINE:/tmp/$BASE3"
docker run -it --rm $MOUNTS $DEVKVM "$QEMU_IMAGE"

12
tools/qemu/qemu.sh
View File

@ -45,18 +45,18 @@ echo "$ARGS" | grep -q systemdisk && qemu-img create -f raw systemdisk.img 256M
if [ -n "${CMDLINE}" ] if [ -n "${CMDLINE}" ]
then then
CMDLINE="$(cat $CMDLINE)" APPEND="$(cat $CMDLINE)"
else else
CMDLINE="$*" APPEND="$*"
fi fi
if [ -z "${CMDLINE}" ] if [ -z "${APPEND}" ]
then then
CMDLINE="console=ttyS0" APPEND="console=ttyS0"
fi fi
if [ -z "$EFI_ISO" ] && [ -z "$ISO" ] if [ -z "$EFI_ISO" ] && [ -z "$ISO" ]
then then
ARGS="-append ${CMDLINE} ${ARGS}" ARGS="-append \"${APPEND}\" ${ARGS}"
fi fi
qemu-system-x86_64 -machine q35,accel=kvm:tcg -device virtio-rng-pci -nographic -vnc none -m 1024 $ARGS eval qemu-system-x86_64 -machine q35,accel=kvm:tcg -device virtio-rng-pci -nographic -vnc none -m 1024 $ARGS