add allowExtraConfig and exportFlags to ovftool options

Add allowExtraConfig and exportFlags to ovftool options
OSInside · Sep 5, 2024 · 3fc6bd9 · 3fc6bd9
1 parent 1b9d58c
commit 3fc6bd9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/kiwi/storage/subformat/ova.py b/kiwi/storage/subformat/ova.py
@@ -89,6 +89,15 @@ def create_image_format(self) -> None:
             ovftool, '--shaAlgorithm', raise_on_error=False
         ):
             ovftool_options.append('--shaAlgorithm=SHA1')
+        if CommandCapabilities.has_option_in_help(
+            ovftool, '--allowExtraConfig', raise_on_error=False
+        ):
+            ovftool_options.append('--allowExtraConfig')
+        if CommandCapabilities.has_option_in_help(
+            ovftool, '--exportFlags', raise_on_error=False
+        ):
+            ovftool_options.append('--exportFlags=extraconfig')
+
         Command.run(
             [ovftool] + ovftool_options + [vmx, ova]
         )

diff --git a/test/unit/storage/subformat/ova_test.py b/test/unit/storage/subformat/ova_test.py
@@ -109,6 +109,7 @@ def test_create_image_format(
         mock_command.assert_called_once_with(
             [
                 'ovftool', '--shaAlgorithm=SHA1',
+                '--allowExtraConfig', '--exportFlags=extraconfig',
                 'target_dir/some-disk-image.x86_64-1.2.3.vmx',
                 'target_dir/some-disk-image.x86_64-1.2.3.ova'
             ]