diff --git a/cron-callback.sh b/cron-callback.sh index ed218d9b21e8ab3b890db05683da40a4ef2e0823..7e884b4ab49c39956d4a9f9fd4f88a8f3ccedc1e 100755 --- a/cron-callback.sh +++ b/cron-callback.sh @@ -87,7 +87,8 @@ function start_vm_if_not_running () { # start it [[ ! -f "vm/$name/disk.img" ]] && echo2 "In start_vm, disk image vm/$name/disk.img doesn't exist. Did init_vm fail?" && return 1 echo2 "+ Starting VM $name with options_txt '$options_txt' and uuid $uuid..." - nohup qemu-system-x86_64 --uuid "$uuid" -drive file="vm/$name/disk.img",if=virtio -cdrom "vm/$name/initimg.iso" -cpu host --enable-kvm -bios /usr/share/edk2-ovmf/x64/OVMF.fd -net nic,model=rtl8139 "${options[@]}" >> tmp/qemu.log 2>&1 & disown + [[ -f "vm/$name/initimg.iso" ]] && options+=(-cdrom "vm/$name/initimg.iso") + nohup qemu-system-x86_64 --uuid "$uuid" -drive file="vm/$name/disk.img",if=virtio -cpu host --enable-kvm -bios /usr/share/edk2-ovmf/x64/OVMF.fd -net nic,model=rtl8139 "${options[@]}" >> tmp/qemu.log 2>&1 & disown } function do_init () { diff --git a/runtime.settings b/runtime.settings index d1a31fdb30629f1f691edc3b96d6b658c22ac611..f70f44deb7f6bf051ec3a186c1baa7c1a89234a6 100644 --- a/runtime.settings +++ b/runtime.settings @@ -1,4 +1,4 @@ # name;options (name will be trimmed, options will be passed as-is) instance1;-m 2G -smp 2 -vnc :11 -net user,hostfwd=tcp::30471-:22 gitlab-ci;-m 4G -smp 4 -vnc :12 -net user,hostfwd=tcp::30473-:22 -#httptest ;-m 1G -smp 1 -vnc :13 -net user,hostfwd=tcp::30474-:22 +#httptest ;-m 1G -smp 1 -vnc :13 -net user,hostfwd=tcp::30474-:22,hostfwd=tcp::30480-:80