Fix qemu options so a full install really works

.gitignore

@@ -1,9 +1,2 @@
-fs
-fs-*
-iso
-iso-*
-mnt
-mnt-*
+tmp-*
 *.iso
-disk.img
-disk.img-*

run.sh

@@ -46,20 +46,28 @@ set -e
 set -x
 
 cfg=""
+
+cfg+=" -drive file=${DISK},media=disk,format=raw,if=virtio"
+cfg+=" -enable-kvm"
+cfg+=" -m 2048"
+cfg+=" -usbdevice tablet"
+
+cfg+=" -vga vmware"
+#cfg+=" -vnc :0"
+
 case $boot in
     c)
         echo "booting CD with empty disk"
         rm -f ${DISK}
         dd if=/dev/zero "of=${DISK}" bs=1M count=0 seek=10240
-        cfg+=" -drive file=${iso},index=1,media=cdrom"
-        cfg+=" -drive file=${DISK},index=0,media=disk,format=raw"
+        cfg+=" -drive file=${iso},media=cdrom,if=none,id=cd"
+        cfg+=" -device virtio-scsi-pci -device scsi-cd,drive=cd"
         cfg+=" -boot d"
         ;;
     d)
         echo "booting disk with no CD"
-        cfg+=" -drive file=${DISK},index=0,media=disk,format=raw"
         cfg+=" -boot c"
         ;;
 esac
 
-qemu-system-x86_64 -enable-kvm -m 2048 -vga vmware $cfg
+qemu-system-x86_64 $cfg