From 404b71aedc4e989af10dd6f2030e32beff61dfb2 Mon Sep 17 00:00:00 2001
From: David Cassany <dcassany@suse.com>
Date: Fri, 30 Sep 2016 12:11:03 +0200
Subject: [PATCH] Added support for mkisofs

genisoimage and mkisofs tools are slightly different so this commit
makes sure all flags are supported in both tools.
---
 kiwi/builder/live.py           |  4 ++--
 kiwi/iso.py                    | 13 ++++++-------
 test/unit/builder_live_test.py |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/kiwi/builder/live.py b/kiwi/builder/live.py
index 5d24e1f1..bcefeaa8 100644
--- a/kiwi/builder/live.py
+++ b/kiwi/builder/live.py
@@ -241,8 +241,8 @@ class LiveImageBuilder(object):
         # calculate size and decide if we need UDF
         if rootsize.accumulate_mbyte_file_sizes() > 4096:
             log.info('ISO exceeds 4G size, using UDF filesystem')
-            custom_iso_args['create_options'].append('-allow-limited-size')
-            custom_iso_args['create_options'].append('-udf')
+            custom_iso_args['create_options'].append('-iso-level')
+            custom_iso_args['create_options'].append('3')
 
         # create iso filesystem from media_dir
         log.info('Creating live ISO image')
diff --git a/kiwi/iso.py b/kiwi/iso.py
index 065b85ca..93e91e7e 100644
--- a/kiwi/iso.py
+++ b/kiwi/iso.py
@@ -350,18 +350,17 @@ class Iso(object):
         listing_result = {}
         for line in listing.output.split('\n'):
             iso_entry = re.search(
-                '^(.).*\s\[\s*(\d+)(\s+\d+)?\]\s+(.*?)\s*$', line
+                '.*(-[-rwx]{9}).*\s\[\s*(\d+)(\s+\d+)?\]\s+(.*?)\s*$', line
             )
             if iso_entry:
                 entry_type = iso_entry.group(1)
                 entry_name = iso_entry.group(4)
                 entry_addr = int(iso_entry.group(2))
-                if entry_type == '-':
-                    listing_result[entry_addr] = listing_type(
-                        name=entry_name,
-                        filetype=entry_type,
-                        start=entry_addr
-                    )
+                listing_result[entry_addr] = listing_type(
+                    name=entry_name,
+                    filetype=entry_type,
+                    start=entry_addr
+                )
         return collections.OrderedDict(
             sorted(listing_result.items())
         )
diff --git a/test/unit/builder_live_test.py b/test/unit/builder_live_test.py
index bf1b7357..90307e77 100644
--- a/test/unit/builder_live_test.py
+++ b/test/unit/builder_live_test.py
@@ -208,7 +208,7 @@ class TestLiveImageBuilder(object):
                     '-p', '"KIWI - http://suse.github.com/kiwi"',
                     '-publisher', '"SUSE LINUX GmbH"',
                     '-V', '"volid"',
-                    '-allow-limited-size', '-udf'
+                    '-iso-level', '3'
                 ]
             }, device_provider=None, root_dir='temp_media_dir'
         )