From f4a1302358c2c373efc04f59513c641eecdc472a Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Tue, 23 Aug 2016 11:12:35 +0530 Subject: [PATCH] Add ppc64le kernel path (cherry picked from commit b76fba85ea5aabc4d8dff901d82ed0a910036e7a) --- src/pylorax/mount.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pylorax/mount.py b/src/pylorax/mount.py index 901ae3ed..785a81fa 100644 --- a/src/pylorax/mount.py +++ b/src/pylorax/mount.py @@ -57,8 +57,8 @@ class IsoMountpoint(object): else: self.mount_dir = self.initrd_path - self.kernel = self.mount_dir+"/isolinux/vmlinuz" - self.initrd = self.mount_dir+"/isolinux/initrd.img" + kernel_list = [("/isolinux/vmlinuz", "/isolinux/initrd.img"), + ("/ppc/ppc64/vmlinuz", "/ppc/ppc64/initrd.img")] if os.path.isdir(self.mount_dir+"/repodata"): self.repo = self.mount_dir @@ -68,9 +68,15 @@ class IsoMountpoint(object): os.path.exists(self.mount_dir+"/images/install.img") try: - for f in [self.kernel, self.initrd]: - if not os.path.isfile(f): - raise Exception("Missing file on iso: {0}".format(f)) + for kernel, initrd in kernel_list: + if (os.path.isfile(self.mount_dir+kernel) and + os.path.isfile(self.mount_dir+initrd)): + self.kernel = self.mount_dir+kernel + self.initrd = self.mount_dir+initrd + break + else: + raise Exception("Missing kernel and initrd file in iso, failed" + " to search under: {0}".format(kernel_list)) except: self.umount() raise