-BOOT="-boot menu=on"
-[ -z "$EFI" ] || BOOT="-bios /usr/share/OVMF/OVMF_CODE.fd"
-
-[ -d disk.raw ] || dd if=/dev/zero of=disk.raw bs=1G count=0 seek=8
+if [ -z "$ISO" ] ; then
+ if [ -z "$EFI" ] ; then
+ BOOT="-boot menu=on"
+ DISK2="-drive index=1,id=boot,media=disk,format=raw,file=bootimage.raw"
+ else
+ BOOT="-bios /usr/share/OVMF/OVMF_CODE.fd"
+ DISK2="-drive index=1,id=boot,media=disk,format=raw,file=bootimage.raw"
+ fi
+else
+ if [ -z "$EFI" ] ; then
+ BOOT="-boot menu=on"
+ DISK2="-drive index=1,id=boot,media=cdrom,format=raw,file=tiniest.iso"
+ else
+ BOOT="-bios /usr/share/OVMF/OVMF_CODE.fd"
+ DISK2="-drive index=1,id=boot,media=disk,format=raw,file=tiniest.iso"
+ fi
+fi