Merge remote branch 'autotest-upstream/master' into merge-upstream

client/tests/kvm/test_setup.py

Index: client/tests/kvm/test_setup.py
diff --git a/client/tests/kvm/test_setup.py b/client/tests/kvm/test_setup.py
index b5c3a49b56df8503692d255276881c894908e0b7..1125aeadff8370e908e63697f230dc362d613a68 100644
--- a/client/tests/kvm/test_setup.py
+++ b/client/tests/kvm/test_setup.py
@@ -68,6 +68,7 @@ class Disk(object):
 
 
     def copy_to(self, src):
+        logging.debug("Copying %s to disk image mount", src)
         dst = os.path.join(self.mount, os.path.basename(src))
         if os.path.isdir(src):
             shutil.copytree(src, dst)
@@ -227,8 +228,7 @@ class UnattendedInstallConfig(object):
                       'unattended_file', 'medium', 'url', 'kernel', 'initrd',
                       'nfs_server', 'nfs_dir', 'install_virtio', 'floppy',
                       'cdrom_unattended', 'boot_path', 'extra_params',
-                      'qemu_img_binary', 'cdkey', 'virtio_storage_path',
-                      'virtio_network_path', 'virtio_network_installer_path']
+                      'qemu_img_binary', 'cdkey', 'finish_program']
 
         for a in attributes:
             setattr(self, a, params.get(a, ''))
@@ -245,6 +245,9 @@ class UnattendedInstallConfig(object):
         if getattr(self, 'unattended_file'):
             self.unattended_file = os.path.join(root_dir, self.unattended_file)
 
+        if getattr(self, 'finish_program'):
+            self.finish_program = os.path.join(root_dir, self.finish_program)
+
         if getattr(self, 'qemu_img_binary'):
             if not os.path.isfile(getattr(self, 'qemu_img_binary')):
                 self.qemu_img_binary = os.path.join(root_dir,