almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

IsoMountpoint: Add ppc64le kernel to search (#1373358)

Browse Source 
Resolves: rhbz#1373358
This commit is contained in:
Brian C. Lane 2017-08-08 14:41:43 -07:00
parent d30143d146
commit 3cfd532382
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sbin/livemedia-creator
View File

@ -206,9 +206,8 @@ class IsoMountpoint(object):
else: else:
self.mount_dir = self.initrd_path self.mount_dir = self.initrd_path
self.kernel = self.mount_dir+"/isolinux/vmlinuz" kernel_list = [("/isolinux/vmlinuz", "/isolinux/initrd.img"),
self.initrd = self.mount_dir+"/isolinux/initrd.img" ("/ppc/ppc64/vmlinuz", "/ppc/ppc64/initrd.img")]
if os.path.isdir( self.mount_dir+"/repodata" ): if os.path.isdir( self.mount_dir+"/repodata" ):
self.repo = self.mount_dir self.repo = self.mount_dir
else: else:
@ -216,9 +215,15 @@ class IsoMountpoint(object):
self.liveos = os.path.isdir( self.mount_dir+"/LiveOS" ) self.liveos = os.path.isdir( self.mount_dir+"/LiveOS" )
try: try:
for f in [self.kernel, self.initrd]: for kernel, initrd in kernel_list:
if not os.path.isfile(f): if (os.path.isfile(self.mount_dir+kernel) and
raise Exception("Missing file on iso: {0}".format(f)) 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: except:
self.umount() self.umount()
raise raise