From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Meneghel Rodrigues Subject: [PATCH 15/16] virt: Fix unattended install for libvirt case Date: Thu, 3 Nov 2011 19:26:21 -0200 Message-ID: <1320355582-4342-16-git-send-email-lmr@redhat.com> References: <1320355582-4342-1-git-send-email-lmr@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: autotest@test.kernel.org Return-path: In-Reply-To: <1320355582-4342-1-git-send-email-lmr@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org 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 --- 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