You can specify drivers from a CDROM for those Operating Systems, so no need
of drivers in the floppy.

Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
---
 client/tests/kvm/test_setup.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/tests/kvm/test_setup.py b/client/tests/kvm/test_setup.py
index 844108f..997b9f9 100644
--- a/client/tests/kvm/test_setup.py
+++ b/client/tests/kvm/test_setup.py
@@ -173,12 +173,17 @@ class FloppyDisk(Disk):
 
         Win2008, Vista and 7 require people to point out the path to the 
drivers
         on the unattended file, so we just need to copy the drivers to the
-        driver floppy disk.
+        driver floppy disk. If we provide a path inside a CDROM with the 
drivers,
+        then there is no need to use a floppy at all.
         Process:
 
         1) Copy the virtio drivers on the virtio floppy to the install floppy
+            (if there is one)
         """
-        self._copy_virtio_drivers(virtio_floppy)
+        if os.path.isfile(virtio_floppy):
+            self._copy_virtio_drivers(virtio_floppy)
+        else:
+            logging.debug("No virtio floppy present, not needed for this OS 
anyway")
 
 
 class CdromDisk(Disk):
-- 
1.7.3.4

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to