1.1 --- a/tests/clitest.py	Wed Jun 23 11:34:16 2010 -0400
     1.2 +++ b/tests/clitest.py	Wed Jul 14 10:18:30 2010 -0400
     1.3 @@ -354,6 +354,8 @@
     1.4          "--hvm --import --disk path=virt-install",
     1.5          # PV Import install
     1.6          "--paravirt --import --disk path=virt-install",
     1.7 +        # Import a floppy disk
     1.8 +        "--hvm --import --disk path=virt-install,device=floppy",
     1.9          # --autostart flag
    1.10          "--hvm --nodisks --pxe --autostart",
    1.11          # --description

     2.1 --- a/virtinst/ImportInstaller.py	Wed Jun 23 11:34:16 2010 -0400
     2.2 +++ b/virtinst/ImportInstaller.py	Wed Jul 14 10:18:30 2010 -0400
     2.3 @@ -26,7 +26,7 @@
     2.4      stage.
     2.5  
     2.6      ImportInstaller sets the Guest's boot device to that of the first disk
     2.7 -    attached to the Guest (so, one of 'hd', 'cdrom', or 'floppy'). All the
     2.8 +    attached to the Guest (so, one of 'hd', 'cdrom', or 'fd'). All the
     2.9      user has to do is fill in the Guest object with the desired parameters.
    2.10      """
    2.11  
    2.12 @@ -58,6 +58,6 @@
    2.13          elif disk.device == VirtualDisk.DEVICE_CDROM:
    2.14              return "cdrom"
    2.15          elif disk.device == VirtualDisk.DEVICE_FLOPPY:
    2.16 -            return "floppy"
    2.17 +            return "fd"
    2.18          else:
    2.19              return "hd"