dab7b8732a
Before this commit isolinux was used to boot an ISO and thus forms a hard requirement. isolinux however only exists for the x86 platform. This limitation did not allow to create ISO images for other platforms. With this commit a refactoring of the ISO boot setup is introduced. * isolinux is only used if the bios firmware is requested and the platform matches the x86 architecture. A runtime check will check for this condition and exits early if not applicable * in case of the EFI firmware we already used grub in EFI mode but still had isolinux in place for the legacy/CSM boot. That part is now also replaced by a platform specific grub eltorito image and grub's boot_hybrid.img for hybrid boot. On platforms that do not provide those modules the support for it will be skipped With this change in place it's possible to control the ISO boot layout through the firmware setup and all platform specific modules are handled as such. Therefore we also deleted the syslinux requirement. This Fixes #1092
208 lines
6.6 KiB
Python
208 lines
6.6 KiB
Python
from mock import (
|
|
patch, Mock, call
|
|
)
|
|
from .test_helper import raises
|
|
|
|
from kiwi.iso_tools.base import IsoToolsBase
|
|
|
|
|
|
class TestIsoToolsBase(object):
|
|
@patch('platform.machine')
|
|
def setup(self, mock_machine):
|
|
mock_machine.return_value = 'x86_64'
|
|
self.iso_tool = IsoToolsBase('source-dir')
|
|
|
|
@raises(NotImplementedError)
|
|
def test_create_iso(self):
|
|
self.iso_tool.create_iso('filename')
|
|
|
|
@raises(NotImplementedError)
|
|
def test_list_iso(self):
|
|
self.iso_tool.list_iso('isofile')
|
|
|
|
@raises(NotImplementedError)
|
|
def test_get_tool_name(self):
|
|
self.iso_tool.get_tool_name()
|
|
|
|
@raises(NotImplementedError)
|
|
def test_init_iso_creation_parameters(self):
|
|
self.iso_tool.init_iso_creation_parameters()
|
|
|
|
@raises(NotImplementedError)
|
|
def test_add_efi_loader_parameters(self):
|
|
self.iso_tool.add_efi_loader_parameters()
|
|
|
|
@raises(NotImplementedError)
|
|
def test_has_iso_hybrid_capability(self):
|
|
self.iso_tool.has_iso_hybrid_capability()
|
|
|
|
@patch('kiwi.iso_tools.base.DataSync')
|
|
@patch('kiwi.iso_tools.base.shutil')
|
|
@patch('kiwi.iso_tools.base.Command.run')
|
|
@patch('kiwi.iso_tools.base.Path')
|
|
@patch('os.path.exists')
|
|
def test_setup_media_loader_directory(
|
|
self, mock_exists, mock_Path, mock_command, mock_shutil, mock_sync
|
|
):
|
|
mock_exists.return_value = True
|
|
data = Mock()
|
|
mock_sync.return_value = data
|
|
self.iso_tool.setup_media_loader_directory(
|
|
'root_dir', 'media_dir', 'openSUSE'
|
|
)
|
|
assert mock_shutil.copy.call_args_list == [
|
|
call(
|
|
'root_dir/usr/share/grub2/i386-pc/eltorito.img',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/grub2/i386-pc/boot_hybrid.img',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/isolinux.bin',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/isolinux.bin',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/isolinux.bin',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/ldlinux.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/ldlinux.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/ldlinux.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/libcom32.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/libcom32.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/libcom32.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/libutil.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/libutil.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/libutil.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/gfxboot.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/gfxboot.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/gfxboot.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/gfxboot.com',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/gfxboot.com',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/gfxboot.com',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/menu.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/menu.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/menu.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/chain.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/chain.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/chain.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/share/syslinux/mboot.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/syslinux/modules/bios/mboot.c32',
|
|
'root_dir/image/loader/'
|
|
),
|
|
call(
|
|
'root_dir/usr/lib/ISOLINUX/mboot.c32',
|
|
'root_dir/image/loader/'
|
|
)
|
|
]
|
|
assert mock_command.call_args_list == [
|
|
call(
|
|
command=[
|
|
'bash', '-c',
|
|
'cp root_dir/boot/memtest* '
|
|
'root_dir/image/loader//memtest'
|
|
], raise_on_error=False
|
|
),
|
|
call(
|
|
[
|
|
'bash', '-c',
|
|
'cp root_dir/etc/bootsplash/themes/openSUSE/'
|
|
'cdrom/* root_dir/image/loader/'
|
|
]
|
|
),
|
|
call(
|
|
[
|
|
'gfxboot',
|
|
'--config-file', 'root_dir/image/loader//gfxboot.cfg',
|
|
'--change-config', 'install::autodown=0'
|
|
]
|
|
),
|
|
call(
|
|
[
|
|
'cp',
|
|
'root_dir/etc/bootsplash/themes/openSUSE/'
|
|
'bootloader/message', 'root_dir/image/loader/'
|
|
]
|
|
)
|
|
]
|
|
mock_sync.assert_called_once_with(
|
|
'root_dir/image/loader/',
|
|
'media_dir/boot/x86_64/loader'
|
|
)
|
|
data.sync_data.assert_called_once_with(
|
|
options=['-z', '-a']
|
|
)
|