X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=run.sh;h=519621d43058f390518b8b683375abbc555d8ac1;hb=d3c0d6890a7770a94b6463da39f5ba613b02cb3a;hp=3f19b19b8aa7a6313e7dfd1fb4d21f6959777164;hpb=0ec35401283c9d80249141e6db7e2b490feadfe0;p=rrq%2Frescue-boot.git

diff --git a/run.sh b/run.sh
index 3f19b19..519621d 100755
--- a/run.sh
+++ b/run.sh
@@ -1,23 +1,32 @@
 #!/bin/bash
 
 DISK=disk.raw
+[ -f $DISK ] || dd if=/dev/null of=$DISK bs=1G count=0 seek=4
 CD=$1
-PCODE=/usr/share/OVMF/OVMF_CODE_4M.fd
-PVARS=/usr/share/OVMF/OVMF_VARS_4M.fd
-cp $PVARS pvars.bin
-EFI="
+FS=FS.sqfs
+if [ -n "$EFI" ] ; then
+    PCODE=/usr/share/OVMF/OVMF_CODE_4M.fd
+    PVARS=/usr/share/OVMF/OVMF_VARS_4M.fd
+    cp $PVARS pvars.bin
+    BOOT="
     -drive if=pflash,readonly=on,format=raw,file=$PCODE
     -drive if=pflash,readonly=off,format=raw,file=pvars.bin
 "
+else
+    BOOT="-boot menu=on,splash-time=60000"
+fi
 NET="-nic vde,sock=/run/vde.ctl,model=e1000,mac=06:38:d0:34:20:d2"
 QEMU=qemu-system-x86_64
 [ -z "${CD##*i386*}" ] && QEMU=qemu-system-i386
+CDT=cdrom
+[ -z "${CD##*.img}" ] && CDT=disk
+
 exec $QEMU -name "${CD%.img}" -m 2G -M pc,accel=kvm -cpu host \
-    -drive media=disk,format=raw,file=$CD \
+     $BOOT \
     -drive media=disk,format=raw,file=$DISK \
+    -drive media=$CDT,format=raw,file=$CD \
+    -virtfs local,path=FS,mount_tag=FS,security_model=passthrough \
     -serial mon:stdio -echr 0x1c -vga std \
     $NET
-#    -boot menu=on,splash-time=60000 \
-#    -virtfs local,path=FS,mount_tag=FS,security_model=passthrough \
 #    -kernel FS/vmlinuz -initrd FS/initrd.img \
 #    -append "root=FS rootfstype=9p console=ttyS0"