diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-02-05 12:19:04 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-02-05 12:19:04 +0000 |
| commit | aa192b250c709db4b071b9fd506a0e6583884f24 (patch) | |
| tree | abe86fbe34be3e5898680cc084d077090e1d1170 | |
| parent | 3a48a219967d6f6bd39241206a7dc57355566444 (diff) | |
| download | lh-bootstrap-aa192b250c709db4b071b9fd506a0e6583884f24.tar.xz | |
Add arm and x86_64 qemus, increase init-eth0 sleep to 3
| -rw-r--r-- | layout/rootfs/etc/s6-rc/source-base/init-eth0/up | 2 | ||||
| -rwxr-xr-x | run-qemu | 6 |
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 @@ -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 \ |