From 116e7ca3bd77a523d9088bb3b8a42cb935dcf8ba Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Thu, 14 Dec 2017 10:08:30 +0100
Subject: [PATCH] El-Torito boot information on s390x

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

Signed-off-by: Ondrej Nosek <onosek@redhat.com>
---
 pungi/wrappers/iso.py          |  6 +++---
 tests/test_createiso_script.py | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pungi/wrappers/iso.py b/pungi/wrappers/iso.py
index 7e2c7108..f4ff99d4 100644
--- a/pungi/wrappers/iso.py
+++ b/pungi/wrappers/iso.py
@@ -89,9 +89,8 @@ def get_boot_options(arch, createfrom, efi=True):
 
     if arch in ("s390", "s390x"):
         result = [
-            # "-no-emul-boot",
-            # "-b", "images/cdboot.img",
-            # "-c", "boot.cat",
+            '-eltorito-boot', 'images/cdboot.img',
+            '-no-emul-boot',
         ]
         return result
 
@@ -261,6 +260,7 @@ def get_graft_points(paths, exclusive_paths=None, exclude=None):
     # TODO: exclude
     return result
 
+
 def _paths_from_list(root, paths):
     root = os.path.abspath(root).rstrip("/") + "/"
     result = {}
diff --git a/tests/test_createiso_script.py b/tests/test_createiso_script.py
index 18725787..0a2259bc 100644
--- a/tests/test_createiso_script.py
+++ b/tests/test_createiso_script.py
@@ -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']
         )
 
+    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):
         createiso.write_script(createiso.CreateIsoOpts(
             output_dir=self.outdir,