diff -u virtinst-0.300.2/debian/patches/11_virtio_virt-install.patch virtinst-0.300.2/debian/patches/11_virtio_virt-install.patch
--- virtinst-0.300.2/debian/patches/11_virtio_virt-install.patch
+++ virtinst-0.300.2/debian/patches/11_virtio_virt-install.patch
@@ -1,6 +1,6 @@
 diff -Nur -x '*.orig' -x '*~' virtinst-0.300.2/virtinst/cli.py virtinst-0.300.2.new/virtinst/cli.py
 --- virtinst-0.300.2/virtinst/cli.py	2007-12-07 04:18:44.000000000 +0100
-+++ virtinst-0.300.2.new/virtinst/cli.py	2008-04-22 19:15:08.698258880 +0200
++++ virtinst-0.300.2.new/virtinst/cli.py	2008-04-25 10:10:11.349558842 +0200
 @@ -166,6 +166,7 @@
      else:
          print >> sys.stderr, _("Unknown network type ") + network
@@ -10,8 +10,8 @@
  
  def digest_networks(macs, bridges, networks):
 diff -Nur -x '*.orig' -x '*~' virtinst-0.300.2/virtinst/FullVirtGuest.py virtinst-0.300.2.new/virtinst/FullVirtGuest.py
---- virtinst-0.300.2/virtinst/FullVirtGuest.py	2008-04-22 19:14:02.000000000 +0200
-+++ virtinst-0.300.2.new/virtinst/FullVirtGuest.py	2008-04-22 19:15:29.786967583 +0200
+--- virtinst-0.300.2/virtinst/FullVirtGuest.py	2008-04-25 10:09:50.000000000 +0200
++++ virtinst-0.300.2.new/virtinst/FullVirtGuest.py	2008-04-25 10:12:49.355804628 +0200
 @@ -35,8 +35,10 @@
                              "apic": True, \
                              "clock": "utc",\
@@ -39,7 +39,7 @@
 +        if self.os_type is not None:
 +            if self.os_variant is not None and FullVirtGuest.OS_TYPES[self.os_type]["variants"][self.os_variant].has_key("virtio_net"):
 +                return FullVirtGuest.OS_TYPES[self.os_type]["variants"][self.os_variant]["virtio_net"]
-+            else:
++            elif self.os_variant is not None and FullVirtGuest.OS_TYPES[self.os_type].has_key("virtio_net"):
 +                return FullVirtGuest.OS_TYPES[self.os_type]["virtio_net"]
 +        return False
 +
@@ -54,7 +54,7 @@
 +        if self.os_type is not None:
 +            if self.os_variant is not None and FullVirtGuest.OS_TYPES[self.os_type]["variants"][self.os_variant].has_key("virtio_blk"):
 +                return FullVirtGuest.OS_TYPES[self.os_type]["variants"][self.os_variant]["virtio_blk"]
-+            else:
++            elif self.os_variant is not None and FullVirtGuest.OS_TYPES[self.os_type].has_key("virtio_blk"):
 +                return FullVirtGuest.OS_TYPES[self.os_type]["virtio_blk"]
 +        return False
 +
@@ -63,7 +63,7 @@
              return FullVirtGuest.OS_TYPES[self.os_type]["variants"][self.os_variant]["distro"]
 diff -Nur -x '*.orig' -x '*~' virtinst-0.300.2/virtinst/Guest.py virtinst-0.300.2.new/virtinst/Guest.py
 --- virtinst-0.300.2/virtinst/Guest.py	2008-01-11 02:33:32.000000000 +0100
-+++ virtinst-0.300.2.new/virtinst/Guest.py	2008-04-22 19:15:08.702310128 +0200
++++ virtinst-0.300.2.new/virtinst/Guest.py	2008-04-25 10:10:11.353487674 +0200
 @@ -183,7 +183,11 @@
              ret += "      <source %(typeattr)s='%(disk)s'/>\n" % { "typeattr": typeattr, "disk": path }
          if self.target is not None:
@@ -115,7 +115,7 @@
          for vm in vms:
 diff -Nur -x '*.orig' -x '*~' virtinst-0.300.2/virt-install virtinst-0.300.2.new/virt-install
 --- virtinst-0.300.2/virt-install	2008-01-07 15:46:01.000000000 +0100
-+++ virtinst-0.300.2.new/virt-install	2008-04-22 19:15:08.702310128 +0200
++++ virtinst-0.300.2.new/virt-install	2008-04-25 10:10:11.353487674 +0200
 @@ -105,6 +105,7 @@
                      continue
              if d.type == virtinst.VirtualDisk.TYPE_FILE and not(hvm) and virtinst.util.is_blktap_capable():
diff -u virtinst-0.300.2/debian/changelog virtinst-0.300.2/debian/changelog
--- virtinst-0.300.2/debian/changelog
+++ virtinst-0.300.2/debian/changelog
@@ -1,3 +1,10 @@
+virtinst (0.300.2-0ubuntu6) hardy-proposed; urgency=low
+
+  * Fix virtio_blk and virtio_net check in case the OS type doesn't have
+    the appropriate attributes set. (LP: #221746)
+
+ -- Soren Hansen <soren@ubuntu.com>  Fri, 25 Apr 2008 10:14:37 +0200
+
 virtinst (0.300.2-0ubuntu5) hardy; urgency=low
 
   * Disable virtio-blk by default for Ubuntu Hardy. See kvm's changelog