summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-eth0/up2
-rwxr-xr-xrun-qemu6
2 files changed, 5 insertions, 3 deletions
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/up b/layout/rootfs/etc/s6-rc/source-base/init-eth0/up
index b3dd787..871558f 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-eth0/up
+++ b/layout/rootfs/etc/s6-rc/source-base/init-eth0/up
@@ -1,3 +1,3 @@
-if { sleep 2 } # delay to load virtio-net
+if { sleep 3 } # delay to load virtio-net
if { ip addr add 10.0.2.1/24 dev eth0 }
ip link set dev eth0 up
diff --git a/run-qemu b/run-qemu
index 8bd4c98..e3c8aa8 100755
--- a/run-qemu
+++ b/run-qemu
@@ -5,10 +5,12 @@ if test -n "$CONSOLE" ; then
fi
case "$QEMU_ARCH" in
- aarch64) cpuoption="-cpu cortex-a57" ;;
+ arm) cpuoption="-M virt -cpu cortex-a15" ;;
+ aarch64) cpuoption="-M virt -cpu cortex-a57" ;;
+ x86_64) cpuoption="-M pc -cpu qemu64"
esac
-exec qemu-system-${QEMU_ARCH} -nographic -M virt $cpuoption -smp 4 -m 2G -nodefaults -display none -serial mon:stdio \
+exec qemu-system-${QEMU_ARCH} -nographic $cpuoption -smp 4 -m 2G -nodefaults -display none -serial mon:stdio \
-kernel "$OUTPUT/kernel" \
-append "root=/dev/vda $consoleoption" \
-drive if=virtio,file=$OUTPUT/rootfs.qcow2,format=qcow2,media=disk,index=1 \