github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-01 15:08:33 +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
parent 3223897232 7f0761c5f1
commit 40cc6d8110
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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}" ]
then
CMDLINE="$(cat $CMDLINE)"
APPEND="$(cat $CMDLINE)"
else
CMDLINE="$*"
APPEND="$*"
fi
if [ -z "${CMDLINE}" ]
if [ -z "${APPEND}" ]
then
CMDLINE="console=ttyS0"
APPEND="console=ttyS0"
fi
if [ -z "$EFI_ISO" ] && [ -z "$ISO" ]
then
ARGS="-append ${CMDLINE} ${ARGS}"
ARGS="-append \"${APPEND}\" ${ARGS}"
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