almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

El-Torito boot information on s390x

Browse Source 
Relates: https://github.com/rhinstaller/lorax/pull/236

Signed-off-by: Ondrej Nosek <onosek@redhat.com>
This commit is contained in:
Ondrej Nosek 2017-12-14 10:08:30 +01:00
parent 59c162d46f
commit 116e7ca3bd
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pungi/wrappers/iso.py
View File

@ -89,9 +89,8 @@ def get_boot_options(arch, createfrom, efi=True):
if arch in ("s390", "s390x"): if arch in ("s390", "s390x"):
result = [ result = [
# "-no-emul-boot", '-eltorito-boot', 'images/cdboot.img',
# "-b", "images/cdboot.img", '-no-emul-boot',
# "-c", "boot.cat",
] ]
return result return result
@ -261,6 +260,7 @@ def get_graft_points(paths, exclusive_paths=None, exclude=None):
# TODO: exclude # TODO: exclude
return result return result
def _paths_from_list(root, paths): def _paths_from_list(root, paths):
root = os.path.abspath(root).rstrip("/") + "/" root = os.path.abspath(root).rstrip("/") + "/"
result = {} result = {}

24
tests/test_createiso_script.py
View File

@ -129,6 +129,30 @@ class CreateIsoScriptTest(helpers.PungiTestCase):
'isoinfo -R -f -i DP-1.0-20160405.t.3-ppc64.iso | grep -v \'/TRANS.TBL$\' | sort >> DP-1.0-20160405.t.3-ppc64.iso.manifest'] 'isoinfo -R -f -i DP-1.0-20160405.t.3-ppc64.iso | grep -v \'/TRANS.TBL$\' | sort >> DP-1.0-20160405.t.3-ppc64.iso.manifest']
) )
def test_bootable_run_on_s390x(self):
createiso.write_script(createiso.CreateIsoOpts(
output_dir=self.outdir,
iso_name='DP-1.0-20160405.t.3-s390x.iso',
volid='DP-1.0-20160405.t.3',
graft_points='graft-list',
arch='s390x',
buildinstall_method='lorax',
), self.out)
self.assertScript(
[createiso.FIND_TEMPLATE_SNIPPET,
' '.join(['/usr/bin/genisoimage', '-untranslated-filenames',
'-volid', 'DP-1.0-20160405.t.3', '-J', '-joliet-long',
'-rational-rock', '-translation-table',
'-input-charset', 'utf-8',
'-x', './lost+found',
'-eltorito-boot images/cdboot.img', '-no-emul-boot',
'-o', 'DP-1.0-20160405.t.3-s390x.iso',
'-graft-points', '-path-list', 'graft-list']),
' '.join(['/usr/bin/implantisomd5', 'DP-1.0-20160405.t.3-s390x.iso']),
'isoinfo -R -f -i DP-1.0-20160405.t.3-s390x.iso | grep -v \'/TRANS.TBL$\' | sort >> DP-1.0-20160405.t.3-s390x.iso.manifest']
)
def test_bootable_run_buildinstall(self): def test_bootable_run_buildinstall(self):
createiso.write_script(createiso.CreateIsoOpts( createiso.write_script(createiso.CreateIsoOpts(
output_dir=self.outdir, output_dir=self.outdir,