diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-26 13:56:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-26 13:56:25 +0000 |
| commit | 04c45f88a58f92c12cbade0ea761f535849b3bb8 (patch) | |
| tree | 41820171a1d3b5a75e05525211e1d2fbcaff9eda /ironic | |
| parent | 9dfb7a927f7b7e1a735b5050e063cc05b8fe5a70 (diff) | |
| parent | 7ca27601d628d51d111a9742c298386e188e42e7 (diff) | |
| download | ironic-04c45f88a58f92c12cbade0ea761f535849b3bb8.tar.gz | |
Merge "Remove default option from create iso image"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/common/images.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/common/test_images.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ironic/common/images.py b/ironic/common/images.py index d2eb0d76e..0f83b8726 100644 --- a/ironic/common/images.py +++ b/ironic/common/images.py @@ -239,7 +239,7 @@ def create_isolinux_image_for_bios( try: utils.execute('mkisofs', '-r', '-V', _label(files_info), - '-cache-inodes', '-J', '-l', '-no-emul-boot', + '-J', '-l', '-no-emul-boot', '-boot-load-size', '4', '-boot-info-table', '-b', ISOLINUX_BIN, '-o', output_file, tmpdir) except processutils.ProcessExecutionError as e: diff --git a/ironic/tests/unit/common/test_images.py b/ironic/tests/unit/common/test_images.py index 2f9875f46..14017682b 100644 --- a/ironic/tests/unit/common/test_images.py +++ b/ironic/tests/unit/common/test_images.py @@ -638,7 +638,7 @@ class FsImageTestCase(base.TestCase): write_to_file_mock.assert_called_once_with(cfg_file, cfg) execute_mock.assert_called_once_with( 'mkisofs', '-r', '-V', - "VMEDIA_BOOT_ISO", '-cache-inodes', '-J', '-l', + "VMEDIA_BOOT_ISO", '-J', '-l', '-no-emul-boot', '-boot-load-size', '4', '-boot-info-table', '-b', 'isolinux/isolinux.bin', '-o', 'tgt_file', 'tmpdir') |