Only move vmlinuz and initrd.img in case the file names are
actually different from the ones virt-install is expecting.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
---
client/virt/tests/unattended_install.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/client/virt/tests/unattended_install.py b/client/virt/tests/unattended_install.py
index 862ea80..7316b24 100644
--- a/client/virt/tests/unattended_install.py
+++ b/client/virt/tests/unattended_install.py
@@ -634,8 +634,10 @@ class UnattendedInstallConfig(object):
os.chdir(self.image_path)
base_kernel = os.path.basename(self.kernel)
base_initrd = os.path.basename(self.initrd)
- utils.run("mv %s vmlinuz" % base_kernel)
- utils.run("mv %s initrd.img" % base_initrd)
+ if base_kernel != 'vmlinux':
+ utils.run("mv %s vmlinuz" % base_kernel)
+ if base_initrd != 'initrd.img':
+ utils.run("mv %s initrd.img" % base_initrd)
finally:
cleanup(self.cdrom_cd1_mount)
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
